Additional odifications to compile without ZeroMQ
authorhristov <Peter.Hristov@cern.ch>
Tue, 12 Aug 2014 15:43:53 +0000 (17:43 +0200)
committerhristov <Peter.Hristov@cern.ch>
Tue, 12 Aug 2014 15:43:53 +0000 (17:43 +0200)
EVE/EveBase/AliEveConfigManager.cxx
MONITOR/CMakelibMONITOR.pkg
MONITOR/CMakelibMONITORzmq.pkg
MONITOR/MONITORLinkDef.h
MONITOR/MONITORzmqLinkDef.h

index 23232d7..75ab46d 100644 (file)
 #include "AliEveMacro.h"
 
 //Storage Manager:
+#ifdef ZMQ
 #include "AliStorageAdministratorPanelListEvents.h"
 #include "AliStorageAdministratorPanelMarkEvent.h"
+#endif
 
 class AliEveMacroExecutor;
 class TEveProjectionManager;
@@ -185,8 +187,10 @@ AliEveConfigManager::AliEveConfigManager() :
 
   //Storage Manager:
   fStoragePopup = new TGPopupMenu(gClient->GetRoot());
+#ifdef ZMQ
   fStoragePopup->AddEntry("&List events",kStorageListEvents);
   fStoragePopup->AddEntry("&Mark event",kStorageMarkEvent);
+#endif
 
   fStoragePopup->Connect("Activated(Int_t)","AliEveConfigManager",
                         this, "AliEvePopupHandler(Int_t)");
@@ -1033,19 +1037,22 @@ void AliEveConfigManager::AliEvePopupHandler(Int_t id)
 */
   case kStorageListEvents:
   {
+#ifdef ZMQ
       fListEventsWindow =
                  AliStorageAdministratorPanelListEvents::GetInstance();
       
       fListEventsWindow->Connect("SelectedEvent()","AliEveConfigManager",this,"SetEventInEventManager()");
-      
+#endif      
       
          break;
 
   }
    case kStorageMarkEvent:
   {
+#ifdef ZMQ
          AliStorageAdministratorPanelMarkEvent *markEventWindow =
                  AliStorageAdministratorPanelMarkEvent::GetInstance();
+#endif
          break;
 
   }
index 7a7aa96..004470e 100644 (file)
@@ -6,8 +6,6 @@ set ( SRCS
     AliChildProcTerminator.cxx
     alitestproc/AliTestChildProc.cxx
     alieventserver/AliEventServerPreferencesWindow.cxx
-    alieventserver/AliEventServerReconstruction.cxx
-    alieventserver/AliEventServerWindow.cxx
 )
 
 string ( REPLACE ".cxx" ".h" CINTHDRS "${SRCS}" )
index 3b7719e..4ca5d74 100644 (file)
@@ -8,6 +8,9 @@ set ( SRCS
     alistoragemanager/AliStorageAdministratorPanelSetStorageParams.cxx
     alistoragemanager/AliStorageEventManager.cxx
     alistoragemanager/AliStorageDatabase.cxx
+    alieventserver/AliEventServerReconstruction.cxx
+    alieventserver/AliEventServerWindow.cxx
+
 )
 
 string ( REPLACE ".cxx" ".h" CINTHDRS "${SRCS}" )
index ef487a3..cdeb0b2 100644 (file)
@@ -21,7 +21,4 @@
 #pragma link C++ class AliChildProcTerminator+;
 #pragma link C++ class AliTestChildProc+;
 
-#pragma link C++ class AliEventServerWindow+;
-#pragma link C++ class AliEventServerReconstruction+;
-
 #endif
index 9bac783..2eab316 100644 (file)
@@ -18,5 +18,7 @@
 #pragma link C++ class AliStorageAdministratorPanelMarkEvent+;
 #pragma link C++ class AliStorageAdministratorPanelListEvents+;
 #pragma link C++ class AliStorageAdministratorPanelSetStorageParams+;
+#pragma link C++ class AliEventServerReconstruction+;
+#pragma link C++ class AliEventServerWindow+;
 
 #endif