ZeroMQ dependent part + cleanup

diff --git a/EVE/CMakebinalihlteve.pkg b/EVE/CMakebinalihlteve.pkg
index 00661384c161805b01bec159549cb168e94a85ff..9fb4ff799f3aae049136938c69b8b2c4d339ea3a 100644 (file)
--- a/EVE/CMakebinalihlteve.pkg
+++ b/EVE/CMakebinalihlteve.pkg
@@ -35,25 +35,11 @@ set ( ELIBS  EveBase EveHLT EveDet HLTbase HLTrec AliHLTUtil AliHLTEve AliHLTTPC
 
 set ( PACKBLIBS  ${ROOTCLIBS} ${ROOTPLIBS} -lTreePlayer -lGeomPainter -lGed -lRGL -lEve ${SYSLIBS} -lVc)
 
-if( ALICE_TARGET STREQUAL "macosx")
-                       
-       set ( ELIBS ${ELIBS} GL)
-       set ( ELIBSDIR ${ELIBSDIR} /usr/X11R6/lib/)
-       
-  list(REMOVE_ITEM ELIBS microcern lhapdf herwig)
+if(ZEROMQ_FOUND)
+set ( ELIBS ${ELIBS} MONITORzmq )
+set ( CXXFLAGS  "-DZMQ ${CXXFLAGS}") 
+ENDIF(ZEROMQ_FOUND)
 
-  ALICE_Format(PACKLDFLAGS "-Wl,-u,_G__cpp_setupG__" "" ${LDFLAGS})
-
-  if( MACOSX_MINOR STREQUAL "5")
-                                               
-               set ( PACKLDFLAGS "${PACKLDFLAGS} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
-
-endif( MACOSX_MINOR STREQUAL "5")
-       
-  set ( ELIBS ${ELIBS} GLU)
-       set ( ELIBSDIR ${ELIBSDIR} ${FINK_ROOT}/lib)
-
-endif( ALICE_TARGET STREQUAL "macosx")
 #
 # Local Variables:
 #  mode: CMake

diff --git a/MONITOR/alieventserver/CMakebinalieventserver.pkg b/MONITOR/alieventserver/CMakebinalieventserver.pkg
index fb629a5844d2066a7fdef33280b1d385ad11a457..008dd1bd4d4374bd69fa5b9176c5557b1d77c417 100644 (file)
--- a/MONITOR/alieventserver/CMakebinalieventserver.pkg
+++ b/MONITOR/alieventserver/CMakebinalieventserver.pkg
@@ -1,3 +1,4 @@
+# -*- mode: CMake -*-
 #--------------------------------------------------------------------------------#
 # Package File for alionlinemonitor                                              #
 # Author : Johny Jose (johny.jose@cern.ch)                                       #
@@ -39,17 +40,6 @@ if(PYTHIA6)
   list(APPEND ELIBS EVGEN HepMC HepMCParser)
 endif(PYTHIA6)
 
-if( ALICE_TARGET STREQUAL "macosx")
-               
-  string(REGEX REPLACE "(microcern|lhapdf|herwig)" "" ELIBS "${ELIBS}") 
-  
-  ALICE_Format(PACKLDFLAGS "-Wl,-u,_G__cpp_setupG__" "" "${LDFLAGS};${ELIBSCPP}")
-  string ( REPLACE "%" "-Wl,-u,_G__cpp_setupG__%" PACKLDFLAGS "${LDFLAGS} ${ELIBSCPP}" )
-               
-       set ( ELIBSDIR ${ELIBSDIR} ${FINK_ROOT}/lib)
-
-endif( ALICE_TARGET STREQUAL "macosx")
-
 set (ARPACKS FMDbase FMDsim FMDrec ACORDEbase ACORDEsim ACORDErec HMPIDbase HMPIDsim HMPIDrec ZDCbase ZDCsim ZDCrec VZERObase VZEROsim VZEROrec MFTbase MFTsim MFTrec EMCALUtils EMCALbase EMCALsim EMCALrec T0base T0sim T0rec TOFbase TOFsim TOFrec TRDbase TRDsim TRDrec PMDbase PMDsim PMDrec MUONmapping MUONmapping MUONgeometry MUONbase MUONsim MUONrec MUONraw PHOSUtils PHOSbase PHOSsim PHOSrec HLTbase ITSbase ITSsim ITSrec STRUCT TPCbase TPCsim TPCrec TPCfast STEER CDB ESD STEERBase RAWDatabase RAWDatasim RAWDatarec MDC TRIGGERbase)
 
 set(GFILES)
@@ -90,10 +80,3 @@ if (DIMDIR)
   set ( ELIBS ${ELIBS}  dim)
   set ( ELIBSDIR ${ELIBSDIR}  ${DIMDIR}/${ODIR})
 endif (DIMDIR)
-
-if( ALICE_TARGET MATCHES "macosx")
-
-  ALICE_Format (TEMP "-Wl,-u,_G__cpp_setupG__" "" ${ELIBS})
-  set(PACKLDFLAGS "${LDFLAGS} ${TEMP}")
-
-endif( ALICE_TARGET MATCHES "macosx")

diff --git a/MONITOR/alistoragemanager/CMakebinalifakedisplay.pkg b/MONITOR/alistoragemanager/CMakebinalifakedisplay.pkg
index c1444a78e35b169b2156905c0e84eebd6f66b14b..6e3631c9f4499c3b36720c5f1d215b9522394366 100644 (file)
--- a/MONITOR/alistoragemanager/CMakebinalifakedisplay.pkg
+++ b/MONITOR/alistoragemanager/CMakebinalifakedisplay.pkg
@@ -1,3 +1,4 @@
+# -*- mode: CMake -*-
 set ( SRCS  alistoragemanager/alifakedisplay.cxx)
 
 set ( EINCLUDE )
@@ -13,25 +14,9 @@ set (ARPACKS FMDbase FMDsim FMDrec ACORDEbase ACORDEsim ACORDErec HMPIDbase HMPI
 
 set ( PACKBLIBS  ${ROOTCLIBS} ${ROOTPLIBS} -lTreePlayer -lGeomPainter -lGed -lRGL -lEve -lzmq -lMONITOR ${SYSLIBS} )
 
-if( ALICE_TARGET STREQUAL "macosx")
-                       
-       set ( ELIBS ${ELIBS} GL)
-       set ( ELIBSDIR ${ELIBSDIR} /usr/X11R6/lib/)
-       
-  set ( ELIBSCPP ${ELIBS})
-       list(REMOVE_ITEM ELIBSCPP microcern lhapdf herwig)
+set ( ELIBS ${ELIBS} MONITOR )
 
-  ALICE_Format(PACKLDFLAGS "-Wl,-u,_G__cpp_setupG__" "" ${LDFLAGS})
-
-       if( MACOSX_MINOR STREQUAL "5")
-                                               
-               set ( PACKLDFLAGS "${PACKLDFLAGS} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
-
-  endif( MACOSX_MINOR STREQUAL "5")
-       
-  set ( ELIBS ${ELIBS} GLU)
-       set ( ELIBSDIR ${ELIBSDIR} ${FINK_ROOT}/lib)
-       
-endif( ALICE_TARGET STREQUAL "macosx")
-
-set ( ELIBS ${ELIBS} MONITOR )
\ No newline at end of file
+if(ZEROMQ_FOUND)
+set ( ELIBS ${ELIBS} MONITORzmq )
+set ( CXXFLAGS  "-DZMQ ${CXXFLAGS}") 
+ENDIF(ZEROMQ_FOUND)

diff --git a/MONITOR/alistoragemanager/CMakebinalistorage.pkg b/MONITOR/alistoragemanager/CMakebinalistorage.pkg
index 05ed2efead4115a4987622f783f7ef076d078662..18236afcbf526325fc48a101a4118b999a78f08c 100644 (file)
--- a/MONITOR/alistoragemanager/CMakebinalistorage.pkg
+++ b/MONITOR/alistoragemanager/CMakebinalistorage.pkg
@@ -1,3 +1,4 @@
+# -*- mode: CMake -*-
 set ( SRCS  alistoragemanager/alistorage.cxx)
 
 set ( EINCLUDE )
@@ -13,26 +14,5 @@ set (ARPACKS FMDbase FMDsim FMDrec ACORDEbase ACORDEsim ACORDErec HMPIDbase HMPI
 
 set ( PACKBLIBS  ${ROOTCLIBS} ${ROOTPLIBS} -lTreePlayer -lGeomPainter -lGed -lRGL -lEve -lzmq -lMONITOR -lMONITORzmq ${SYSLIBS} )
 
-if( ALICE_TARGET STREQUAL "macosx")
-                       
-       set ( ELIBS ${ELIBS} GL)
-       set ( ELIBSDIR ${ELIBSDIR} /usr/X11R6/lib/)
-       
-  set ( ELIBSCPP ${ELIBS})
-       list(REMOVE_ITEM ELIBSCPP microcern lhapdf herwig)
-
-  ALICE_Format(PACKLDFLAGS "-Wl,-u,_G__cpp_setupG__" "" ${LDFLAGS})
-
-       if( MACOSX_MINOR STREQUAL "5")
-                                               
-               set ( PACKLDFLAGS "${PACKLDFLAGS} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
-
-  endif( MACOSX_MINOR STREQUAL "5")
-       
-  set ( ELIBS ${ELIBS} GLU)
-       set ( ELIBSDIR ${ELIBSDIR} ${FINK_ROOT}/lib)
-       
-endif( ALICE_TARGET STREQUAL "macosx")
-
 set ( ELIBS ${ELIBS} MONITOR MONITORzmq )       
 

diff --git a/MONITOR/alistoragemanager/CMakebinalistorageadmin.pkg b/MONITOR/alistoragemanager/CMakebinalistorageadmin.pkg
index 1fd1f6dc292456bd87b29ea1e0e342a5bea95d72..1738fcb4599be0a4320cd87314c6c4d4748f154e 100644 (file)
--- a/MONITOR/alistoragemanager/CMakebinalistorageadmin.pkg
+++ b/MONITOR/alistoragemanager/CMakebinalistorageadmin.pkg
@@ -1,3 +1,4 @@
+# -*- mode: CMake -*-
 set ( SRCS  alistoragemanager/alistorageadmin.cxx)
 
 set ( EINCLUDE )
@@ -13,25 +14,4 @@ set (ARPACKS FMDbase FMDsim FMDrec ACORDEbase ACORDEsim ACORDErec HMPIDbase HMPI
 
 set ( PACKBLIBS  ${ROOTCLIBS} ${ROOTPLIBS} -lTreePlayer -lGeomPainter -lGed -lRGL -lEve -lzmq -lMONITOR -lMONITORzmq ${SYSLIBS} )
 
-if( ALICE_TARGET STREQUAL "macosx")
-                       
-       set ( ELIBS ${ELIBS} GL)
-       set ( ELIBSDIR ${ELIBSDIR} /usr/X11R6/lib/)
-       
-  set ( ELIBSCPP ${ELIBS})
-       list(REMOVE_ITEM ELIBSCPP microcern lhapdf herwig)
-
-  ALICE_Format(PACKLDFLAGS "-Wl,-u,_G__cpp_setupG__" "" ${LDFLAGS})
-
-       if( MACOSX_MINOR STREQUAL "5")
-                                               
-               set ( PACKLDFLAGS "${PACKLDFLAGS} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
-
-  endif( MACOSX_MINOR STREQUAL "5")
-       
-  set ( ELIBS ${ELIBS} GLU)
-       set ( ELIBSDIR ${ELIBSDIR} ${FINK_ROOT}/lib)
-       
-endif( ALICE_TARGET STREQUAL "macosx")
-
 set ( ELIBS ${ELIBS} MONITOR )
\ No newline at end of file

diff --git a/MONITOR/alistoragemanager/CMakebinalistoragegetpoints.pkg b/MONITOR/alistoragemanager/CMakebinalistoragegetpoints.pkg
index 574fef35f3a87c86441a2c979772459dd2b2c426..4ec7e90e25a9e6ec57948a4ac4ee8119a8bd0921 100644 (file)
--- a/MONITOR/alistoragemanager/CMakebinalistoragegetpoints.pkg
+++ b/MONITOR/alistoragemanager/CMakebinalistoragegetpoints.pkg
@@ -1,3 +1,4 @@
+# -*- mode: CMake -*-
 set ( SRCS  alistoragemanager/alistoragegetpoints.cxx)
 
 set ( EINCLUDE )
@@ -13,25 +14,4 @@ set (ARPACKS FMDbase FMDsim FMDrec ACORDEbase ACORDEsim ACORDErec HMPIDbase HMPI
 
 set ( PACKBLIBS  ${ROOTCLIBS} ${ROOTPLIBS} -lTreePlayer -lGeomPainter -lGed -lRGL -lEve -lzmq -lMONITOR -lMONITORzmq ${SYSLIBS} )
 
-if( ALICE_TARGET STREQUAL "macosx")
-                       
-       set ( ELIBS ${ELIBS} GL)
-       set ( ELIBSDIR ${ELIBSDIR} /usr/X11R6/lib/)
-       
-  set ( ELIBSCPP ${ELIBS})
-       list(REMOVE_ITEM ELIBSCPP microcern lhapdf herwig)
-
-  ALICE_Format(PACKLDFLAGS "-Wl,-u,_G__cpp_setupG__" "" ${LDFLAGS})
-
-       if( MACOSX_MINOR STREQUAL "5")
-                                               
-               set ( PACKLDFLAGS "${PACKLDFLAGS} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
-
-  endif( MACOSX_MINOR STREQUAL "5")
-       
-  set ( ELIBS ${ELIBS} GLU)
-       set ( ELIBSDIR ${ELIBSDIR} ${FINK_ROOT}/lib)
-       
-endif( ALICE_TARGET STREQUAL "macosx")
-
 set ( ELIBS ${ELIBS} MONITOR )
\ No newline at end of file

diff --git a/MONITOR/alistoragemanager/CMakebinalistorageminimalexample.pkg b/MONITOR/alistoragemanager/CMakebinalistorageminimalexample.pkg
index fa04d3568c65dbe0ee6777729a6319205edbe183..15888269c0b2937288f823eb92fe9cf4f478264d 100644 (file)
--- a/MONITOR/alistoragemanager/CMakebinalistorageminimalexample.pkg
+++ b/MONITOR/alistoragemanager/CMakebinalistorageminimalexample.pkg
@@ -1,3 +1,5 @@
+# -*- mode: CMake -*-
+
 set ( SRCS  alistoragemanager/alistorageminimalexample.cxx)
 
 set ( EINCLUDE )
@@ -13,25 +15,4 @@ set (ARPACKS FMDbase FMDsim FMDrec ACORDEbase ACORDEsim ACORDErec HMPIDbase HMPI
 
 set ( PACKBLIBS  ${ROOTCLIBS} ${ROOTPLIBS} -lTreePlayer -lGeomPainter -lGed -lRGL -lEve -lzmq -lMONITOR -lMONITORzmq ${SYSLIBS} )
 
-if( ALICE_TARGET STREQUAL "macosx")
-                       
-       set ( ELIBS ${ELIBS} GL)
-       set ( ELIBSDIR ${ELIBSDIR} /usr/X11R6/lib/)
-       
-  set ( ELIBSCPP ${ELIBS})
-       list(REMOVE_ITEM ELIBSCPP microcern lhapdf herwig)
-
-  ALICE_Format(PACKLDFLAGS "-Wl,-u,_G__cpp_setupG__" "" ${LDFLAGS})
-
-       if( MACOSX_MINOR STREQUAL "5")
-                                               
-               set ( PACKLDFLAGS "${PACKLDFLAGS} -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
-
-  endif( MACOSX_MINOR STREQUAL "5")
-       
-  set ( ELIBS ${ELIBS} GLU)
-       set ( ELIBSDIR ${ELIBSDIR} ${FINK_ROOT}/lib)
-       
-endif( ALICE_TARGET STREQUAL "macosx")
-
 set ( ELIBS ${ELIBS} MONITOR )
\ No newline at end of file

diff --git a/MONITOR/alitestproc/CMakebinalitestproc.pkg b/MONITOR/alitestproc/CMakebinalitestproc.pkg
index 2d4804448bf3a2dfadebf5dfc08d3ffbc91fbe22..493d464f10708ac21875feca127fb21cca14c321 100644 (file)
--- a/MONITOR/alitestproc/CMakebinalitestproc.pkg
+++ b/MONITOR/alitestproc/CMakebinalitestproc.pkg
@@ -1,3 +1,4 @@
+# -*- mode: CMake -*-
 #--------------------------------------------------------------------------------#
 # Package File for alitestproc                                                   #
 # Author : Johny Jose (johny.jose@cern.ch)                                       #
@@ -54,9 +55,7 @@ if (DATE_ROOT)
 
 endif(DATE_ROOT)
 
-if( ALICE_TARGET MATCHES "macosx")
-
-  ALICE_Format(TEMP "-Wl,-u,_G__cpp_setupG__" "" ${ELIBS})
-  set(PACKLDFLAGS "${LDFLAGS} ${ELIBS}")
-
-endif( ALICE_TARGET MATCHES "macosx")
+if(ZEROMQ_FOUND)
+set ( ELIBS ${ELIBS} MONITORzmq )
+set ( CXXFLAGS  "-DZMQ ${CXXFLAGS}") 
+ENDIF(ZEROMQ_FOUND)

diff --git a/MONITOR/deroot/CMakebinderoot.pkg b/MONITOR/deroot/CMakebinderoot.pkg
index 2cd6ec630ff7204738b78469b41945680e1bf3ae..8e68877805fc90b769953d2b11205487c86624b9 100644 (file)
--- a/MONITOR/deroot/CMakebinderoot.pkg
+++ b/MONITOR/deroot/CMakebinderoot.pkg
@@ -1,3 +1,4 @@
+# -*- mode: CMake -*-
 #--------------------------------------------------------------------------------#
 # Package File for deroot                                                        #
 # Author : Johny Jose (johny.jose@cern.ch)                                       #
@@ -36,3 +37,8 @@ set ( SRCS ${SRCS}  deroot/root2date.cxx)
 set ( ELIBSDIR )
 
 set ( ELIBS MONITOR TPCbase TPCsim TPCrec HLTbase ITSbase ITSsim ITSrec MUONmapping MUONevaluation MUONsim MUONrec MUONgeometry MUONcalib MUONbase MUONraw RAWDatasim MUONtrigger MUONcore STEER CDB AOD RAWDatarec ESD RAWDatabase STEERBase ANALYSIS)
+
+if(ZEROMQ_FOUND)
+set ( ELIBS ${ELIBS} MONITORzmq )
+set ( CXXFLAGS  "-DZMQ ${CXXFLAGS}") 
+ENDIF(ZEROMQ_FOUND)

diff --git a/MONITOR/monitorCheck/CMakebinmonitorCheck.pkg b/MONITOR/monitorCheck/CMakebinmonitorCheck.pkg
index e157cb230d9132d9c1fe1f2155e42bf825239a4d..d0c200f0524a3b1ea8e3fbb60d4e32157fc93cba 100644 (file)
--- a/MONITOR/monitorCheck/CMakebinmonitorCheck.pkg
+++ b/MONITOR/monitorCheck/CMakebinmonitorCheck.pkg
@@ -1,3 +1,4 @@
+# -*- mode: CMake -*-
 #--------------------------------------------------------------------------------#
 # Package File for monitorCheck                                                  #
 # Author : Johny Jose (johny.jose@cern.ch)                                       #
@@ -57,9 +58,8 @@ if(DATE_ROOT)
 
 endif(DATE_ROOT)
 
-if( ALICE_TARGET MATCHES "macosx")
-  
-  ALICE_Format(TEMP "-Wl,-u,_G__cpp_setupG__" "" ${ELIBS})
-  set ( PACKLDFLAGS "${LDFLAGS} ${TEMP}")
+if(ZEROMQ_FOUND)
+set ( ELIBS ${ELIBS} MONITORzmq )
+set ( CXXFLAGS  "-DZMQ ${CXXFLAGS}") 
+ENDIF(ZEROMQ_FOUND)
 
-endif( ALICE_TARGET MATCHES "macosx")

diff --git a/MONITOR/monitorGDC/CMakebinmonitorGDC.pkg b/MONITOR/monitorGDC/CMakebinmonitorGDC.pkg
index 8def71c2e3d6a2ef59765cf08800bdbd5622d3c4..afb3852b4b6d10d17d1d73da3315fbf69f851323 100644 (file)
--- a/MONITOR/monitorGDC/CMakebinmonitorGDC.pkg
+++ b/MONITOR/monitorGDC/CMakebinmonitorGDC.pkg
@@ -1,3 +1,4 @@
+# -*- mode: CMake -*-
 #--------------------------------------------------------------------------------#
 # Package File for monitorGDC                                                    #
 # Author : Johny Jose (johny.jose@cern.ch)                                       #
@@ -54,3 +55,7 @@ if (DATE_ROOT)
 
 endif(DATE_ROOT)
 
+if(ZEROMQ_FOUND)
+set ( ELIBS ${ELIBS} MONITORzmq )
+set ( CXXFLAGS  "-DZMQ ${CXXFLAGS}") 
+ENDIF(ZEROMQ_FOUND)