Split the 0MQ dependent part of MINITOR
authorhristov <Peter.Hristov@cern.ch>
Tue, 29 Apr 2014 19:53:59 +0000 (21:53 +0200)
committerhristov <Peter.Hristov@cern.ch>
Tue, 29 Apr 2014 19:57:02 +0000 (21:57 +0200)
MONITOR/CMakeLists.txt
MONITOR/CMakebinalieventserver.pkg
MONITOR/CMakelibMONITOR.pkg
MONITOR/CMakelibMONITORzmq.pkg [new file with mode: 0644]
MONITOR/MONITORLinkDef.h
MONITOR/MONITORzmqLinkDef.h [new file with mode: 0644]

index 3f037b1..ad00c3c 100644 (file)
@@ -6,7 +6,19 @@
 cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
 
 # This will only build MONITOR only if ZeroMQ is found
+set (PACKAGES
+  CMakebinalitestproc.pkg
+  CMakebinderoot.pkg
+  CMakebinmonitorCheck.pkg
+  CMakebinmonitorGDC.pkg
+  CMakelibMONITOR.pkg
+)
+
 if(ZEROMQ_FOUND)
-file(GLOB PACKAGES CMake*.pkg)
-ALICE_BuildModule()
+set(PACKAGES "${PACKAGES}"
+  CMakelibMONITORzmq.pkg
+  CMakebinalieventserver.pkg
+)
 ENDIF(ZEROMQ_FOUND)
+
+ALICE_BuildModule()
index c71d78a..16185de 100644 (file)
@@ -70,7 +70,7 @@ list(APPEND SRCS ${GFILES})
 set ( SHLIBS  ${BINLIBDIRS} EVGEN -lEGPythia6 Pythia6 -lpythia6 AliPythia6 lhapdf THijing hijing THerwig herwig TPHIC FASTSIM microcern)
 
 set ( EINCLUDE STEER/STEER )
-set ( ELIBS ${ELIBS} MONITOR )
+set ( ELIBS ${ELIBS} MONITOR MONITORzmq )
 
 
 set ( DATE_ROOT $ENV{DATE_ROOT})
index 5884f6a..3dbdc42 100644 (file)
@@ -33,9 +33,6 @@ set ( SRCS
     AliDimIntNotifier.cxx 
     AliChildProcTerminator.cxx
     AliEventServerPreferencesWindow.cxx
-    AliEventServerWindow.cxx
-    AliRecoServerThread.cxx
-    AliRecoServer.cxx
     AliTestChildProc.cxx 
     )
 
@@ -45,7 +42,7 @@ string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
 
 set ( DHDR  MONITORLinkDef.h)
 
-set ( EINCLUDE  TPC TPC/Rec ITS RAW STEER/STEER STEER/CDB STEER/STEERBase ZEROMQ_INCLUDE_DIR)
+set ( EINCLUDE  TPC TPC/Rec ITS RAW STEER/STEER STEER/CDB STEER/STEERBase)
 
 set(DIMDIR $ENV{DIMDIR})
 set(ODIR $ENV{ODIR})
diff --git a/MONITOR/CMakelibMONITORzmq.pkg b/MONITOR/CMakelibMONITORzmq.pkg
new file mode 100644 (file)
index 0000000..d2b9856
--- /dev/null
@@ -0,0 +1,61 @@
+# -*- mode: CMake -*- 
+#--------------------------------------------------------------------------------#
+# Package File for MONITOR                                                       #
+# Author : Johny Jose (johny.jose@cern.ch)                                       #
+# Variables Defined :                                                            #
+#                                                                                #
+# SRCS - C++ source files                                                        #
+# HDRS - C++ header files                                                        #
+# DHDR - ROOT Dictionary Linkdef header file                                     #
+# CSRCS - C source files                                                         #
+# CHDRS - C header files                                                         #
+# EINCLUDE - Include directories                                                 #
+# EDEFINE - Compiler definitions                                                 #
+# ELIBS - Extra libraries to link                                                #
+# ELIBSDIR - Extra library directories                                           #
+# PACKFFLAGS - Fortran compiler flags for package                                #
+# PACKCXXFLAGS - C++ compiler flags for package                                  #
+# PACKCFLAGS - C compiler flags for package                                      #
+# PACKSOFLAGS - Shared library linking flags                                     #
+# PACKLDFLAGS - Module linker flags                                              #
+# PACKBLIBS - Libraries to link (Executables only)                               #
+# EXPORT - Header files to be exported                                           #
+# CINTHDRS - Dictionary header files                                             #
+# CINTAUTOLINK - Set automatic dictionary generation                             #
+# ARLIBS - Archive Libraries and objects for linking (Executables only)          #
+# SHLIBS - Shared Libraries and objects for linking (Executables only)           #
+#--------------------------------------------------------------------------------#
+
+set ( SRCS   
+    AliEventServerWindow.cxx
+    AliRecoServerThread.cxx
+    AliRecoServer.cxx
+    )
+
+string ( REPLACE ".cxx" ".h" CINTHDRS "${SRCS}" )
+
+string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )
+
+set ( DHDR  MONITORzmqLinkDef.h)
+
+set ( EINCLUDE  STEER/STEERBase "${ZEROMQ_INCLUDE_DIR}")
+
+set(DIMDIR $ENV{DIMDIR})
+set(ODIR $ENV{ODIR})
+
+if(DIMDIR)
+  set ( SRCS ${SRCS}  SORNotifier.cxx)
+  set ( EINCLUDE ${EINCLUDE}  ${DIMDIR}/dim)
+  set ( ELIBS  dim)
+  set ( ELIBSDIR  ${DIMDIR}/${ODIR})
+  if(ELIBSDIR STREQUAL "${DIMDIR}/")
+    set (ELIBSDIR ${DIMDIR}/linux)
+  endif(ELIBSDIR STREQUAL "${DIMDIR}/")
+
+  set ( CXXFLAGS  "-DALI_DIM ${CXXFLAGS}")
+endif(DIMDIR)
+
+set ( ELIBS ${ELIBS} ${ZEROMQ_LIBRARY} )
+
+# this must be set in a better way
+set ( ELIBSDIR ${ELIBSDIR}  /usr/lib64)
index b585de9..ee26e77 100644 (file)
@@ -10,9 +10,6 @@
 #pragma link off all functions;
 
 #pragma link C++ class AliEventServerPreferencesWindow+;
-#pragma link C++ class AliEventServerWindow+;
-#pragma link C++ class AliRecoServerThread+;
-#pragma link C++ class AliRecoServer+;
 #pragma link C++ class  AliQAHistNavigator+;
 #pragma link C++ class  AliQAHistViewer+;
 #pragma link C++ class  AliQADirList+;
diff --git a/MONITOR/MONITORzmqLinkDef.h b/MONITOR/MONITORzmqLinkDef.h
new file mode 100644 (file)
index 0000000..9ff59c1
--- /dev/null
@@ -0,0 +1,16 @@
+#ifdef __CINT__
+/* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
+ * See cxx source for full Copyright notice                               */
+
+/* $Id$ */
+
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class AliEventServerWindow+;
+#pragma link C++ class AliRecoServerThread+;
+#pragma link C++ class AliRecoServer+;
+
+#endif