From: hristov <Peter.Hristov@cern.ch>
Date: Tue, 12 Aug 2014 15:43:53 +0000 (+0200)
Subject: Additional odifications to compile without ZeroMQ
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=9211a1f1b54ed3a18606125afb2084c21eba90a6;hp=df4c028e95797b6bc24907c0cc61123ac5d2f378;p=u%2Fmrichter%2FAliRoot.git

Additional odifications to compile without ZeroMQ
---

diff --git a/EVE/EveBase/AliEveConfigManager.cxx b/EVE/EveBase/AliEveConfigManager.cxx
index 23232d7221f..75ab46ddfab 100644
--- a/EVE/EveBase/AliEveConfigManager.cxx
+++ b/EVE/EveBase/AliEveConfigManager.cxx
@@ -22,8 +22,10 @@
 #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;
 
   }
diff --git a/MONITOR/CMakelibMONITOR.pkg b/MONITOR/CMakelibMONITOR.pkg
index 7a7aa96868a..004470e1366 100644
--- a/MONITOR/CMakelibMONITOR.pkg
+++ b/MONITOR/CMakelibMONITOR.pkg
@@ -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}" )
diff --git a/MONITOR/CMakelibMONITORzmq.pkg b/MONITOR/CMakelibMONITORzmq.pkg
index 3b7719ee98d..4ca5d743229 100644
--- a/MONITOR/CMakelibMONITORzmq.pkg
+++ b/MONITOR/CMakelibMONITORzmq.pkg
@@ -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}" )
diff --git a/MONITOR/MONITORLinkDef.h b/MONITOR/MONITORLinkDef.h
index ef487a34709..cdeb0b2dfaa 100644
--- a/MONITOR/MONITORLinkDef.h
+++ b/MONITOR/MONITORLinkDef.h
@@ -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
diff --git a/MONITOR/MONITORzmqLinkDef.h b/MONITOR/MONITORzmqLinkDef.h
index 9bac78363f2..2eab31688d3 100644
--- a/MONITOR/MONITORzmqLinkDef.h
+++ b/MONITOR/MONITORzmqLinkDef.h
@@ -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