DATE flags

diff --git a/MONITOR/alionlinereco/CMakeLists.txt b/MONITOR/alionlinereco/CMakeLists.txt
index 7170920a48f8057076570dc93a7fbf3583f019bc..44e6f68edd6665d56a1429ad06617833c5f8bcfb 100644 (file)
--- a/MONITOR/alionlinereco/CMakeLists.txt
+++ b/MONITOR/alionlinereco/CMakeLists.txt
@@ -31,13 +31,30 @@ if(DIMDIR AND ODIR)
     link_directories(${DIMDIR}/${ODIR})
 endif()
 
-if(DATE_FOUND)
-    message(STATUS  "Do something here")
-endif()
-
 # alistorage executable
 add_executable(alionlinereco onlinereco.cxx)
 target_link_libraries(alionlinereco MONITOR MONITORzmq STEERBase STEER)
+
+set(MODULE_COMPILE_FLAGS)
+set(MODULE_LINK_FLAGS)
+
+if(DATE_FOUND)
+    set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS}")
+    set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
+endif(DATE_FOUND)
+
+# Additional compilation and linking flags
+set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}")
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Setting target compile and linking flags
+set_target_properties(alionlinereco PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(alionlinereco PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
+
 if(PYTHIA6)
     target_link_libraries(alionlinereco EVGEN HepMC HepMCParser)
 endif(PYTHIA6)

diff --git a/MONITOR/alitestproc/CMakeLists.txt b/MONITOR/alitestproc/CMakeLists.txt
index 37f5ee3e37efd99103b2b712faecac0381e4bc83..9590f6942cf4ac0d169b619f2cc912e2c6a9e1b7 100644 (file)
--- a/MONITOR/alitestproc/CMakeLists.txt
+++ b/MONITOR/alitestproc/CMakeLists.txt
@@ -39,9 +39,25 @@ endif()
 add_executable(${MODULE} ${SRCS})
 target_link_libraries(${MODULE} MONITOR Rint)
 
+set(MODULE_COMPILE_FLAGS)
+set(MODULE_LINK_FLAGS)
+
 if(DATE_FOUND)
-    target_link_libraries(${MODULE} ${DATE_MONLIBS})
-endif()
+    set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS}")
+    set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
+endif(DATE_FOUND)
+
+# Additional compilation and linking flags
+set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}")
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Setting target compile and linking flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
 
 if(ZEROMQ_FOUND)
     target_link_libraries(${MODULE} MONITORzmq)

diff --git a/MONITOR/monitorCheck/CMakeLists.txt b/MONITOR/monitorCheck/CMakeLists.txt
index 11bc2ce0beb9a6d3f04352b4d9bb76e9818725cb..1759debb15b62a60fa84cc26a80aa47763b28d78 100644 (file)
--- a/MONITOR/monitorCheck/CMakeLists.txt
+++ b/MONITOR/monitorCheck/CMakeLists.txt
@@ -20,7 +20,9 @@ include_directories(${AliRoot_SOURCE_DIR}/MONITOR/${MODULE}
                    )
 
 # Additional include folders in alphabetical order
-include_directories(${AliRoot_SOURCE_DIR}
+include_directories(${AliRoot_SOURCE_DIR}/RAW/RAWDatarec
+                    ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase
+                    ${AliRoot_SOURCE_DIR}/STEER/ESD
                    )
 
 # Sources in alphabetical order
@@ -37,11 +39,27 @@ endif()
 
 # Add an executable to the project using the specified source files
 add_executable(${MODULE} ${SRCS})
-target_link_libraries(${MODULE} Core)
+target_link_libraries(${MODULE} RAWDatarec Core)
 
-if(DATE_FOUND)
-    target_link_libraries(${MODULE} ${DATE_MONLIBS})
-endif()
+set(MODULE_COMPILE_FLAGS)
+set(MODULE_LINK_FLAGS)
+
+#if(DATE_FOUND)
+#    set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS}")
+#    set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
+#endif(DATE_FOUND)
+
+# Additional compilation and linking flags
+set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}")
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Setting target compile and linking flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
 
 if(ZEROMQ_FOUND)
     target_link_libraries(${MODULE} MONITORzmq)

diff --git a/MONITOR/monitorGDC/CMakeLists.txt b/MONITOR/monitorGDC/CMakeLists.txt
index 96ba2d280008154a885cff7afa720f7fec16db37..cf87ddc143643580c6a79ab992aeff64da76460a 100644 (file)
--- a/MONITOR/monitorGDC/CMakeLists.txt
+++ b/MONITOR/monitorGDC/CMakeLists.txt
@@ -39,9 +39,25 @@ endif()
 add_executable(${MODULE} ${SRCS})
 target_link_libraries(${MODULE} Core)
 
+set(MODULE_COMPILE_FLAGS)
+set(MODULE_LINK_FLAGS)
+
 if(DATE_FOUND)
-    target_link_libraries(${MODULE} ${DATE_MONLIBS})
-endif()
+    set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS}")
+    set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
+endif(DATE_FOUND)
+
+# Additional compilation and linking flags
+set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}")
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Setting target compile and linking flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
 
 if(ZEROMQ_FOUND)
     target_link_libraries(${MODULE} MONITORzmq)

diff --git a/RAW/MDC/CMakeLists.txt b/RAW/MDC/CMakeLists.txt
index 57543c2d7b54605ffe46883d5f44db31ad3acbba..3b2a80f0434d818128919be12cc5b623b4fe194e 100644 (file)
--- a/RAW/MDC/CMakeLists.txt
+++ b/RAW/MDC/CMakeLists.txt
@@ -49,21 +49,34 @@ generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
 
 # Generate the ROOT map
 # Dependecies
-set(LIBDEPS ESD RAWDataBase RAWDatarec STEERBase)
+set(LIBDEPS ESD RAWDatabase RAWDatarec STEERBase)
 generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
 
 # Add a library to the project using the specified source files
 add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
-target_link_libraries(${MODULE} STEERBase ESD RAWDatabase RAWDatarec Core RIO Tree)
+target_link_libraries(${MODULE} ESD RAWDatabase RAWDatarec STEERBase)
 
-# Additional compilation flags
-set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")
+# Compile and link flags
+set(MODULE_COMPILE_FLAGS)
+set(MODULE_LINK_FLAGS)
+
+if(DATE_FOUND)
+    set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS}")
+    set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
+endif(DATE_FOUND)
+
+# Additional compilation and linking flags
+set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}")
 
 # System dependent: Modify the way the library is build
 if(${CMAKE_SYSTEM} MATCHES Darwin)
-    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
 endif(${CMAKE_SYSTEM} MATCHES Darwin)
 
+# Setting target compile and linking flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
+
 # Installation
 install(TARGETS ${MODULE}
         ARCHIVE DESTINATION lib

diff --git a/RAW/RAWDatabase/CMakeLists.txt b/RAW/RAWDatabase/CMakeLists.txt
index ec197df70be27c735d232713c2a48174b2abbeba..610b20325d14a6e5a5a038afda640997dffc7b46 100644 (file)
--- a/RAW/RAWDatabase/CMakeLists.txt
+++ b/RAW/RAWDatabase/CMakeLists.txt
@@ -48,9 +48,11 @@ set(SRCS
 string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
 
 # Extra headers in alphabetical order
-set(HDRS ${HDRS} AliRawEventHeaderVersions.h)
-
-#There is some DATE here, check out the lib version
+set(HDRS ${HDRS}
+    AliRawDataHeader.h
+    AliRawDataHeaderV3.h
+    AliRawEventHeaderVersions.h
+   )
 
 # Generate the dictionary
 # It will create G_ARG1.cxx and G_ARG1.h / ARG1 = function first argument
@@ -66,14 +68,26 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}
 add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
 target_link_libraries(${MODULE} ESD STEERBase Core Hist RIO)
 
-# Additional compilation flags
-set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")
+set(MODULE_COMPILE_FLAGS)
+set(MODULE_LINK_FLAGS)
+
+if(DATE_FOUND)
+    set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS}")
+    set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
+endif(DATE_FOUND)
+
+# Additional compilation and linking flags
+set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}")
 
 # System dependent: Modify the way the library is build
 if(${CMAKE_SYSTEM} MATCHES Darwin)
-    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
 endif(${CMAKE_SYSTEM} MATCHES Darwin)
 
+# Setting target compile and linking flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
+
 # Installation
 install(TARGETS ${MODULE}
         ARCHIVE DESTINATION lib

diff --git a/RAW/RAWDatarec/CMakeLists.txt b/RAW/RAWDatarec/CMakeLists.txt
index 06a8aeef2efeed76e40c827a51548d44b5f2cae7..a91e70b167c88356b5012a7f7e8982bd52517e75 100644 (file)
--- a/RAW/RAWDatarec/CMakeLists.txt
+++ b/RAW/RAWDatarec/CMakeLists.txt
@@ -58,16 +58,29 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}
 
 # Add a library to the project using the specified source files
 add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
-target_link_libraries(${MODULE} ESD RAWDatabase STEERBase Core Net RIO TreePlayer Tree)
+target_link_libraries(${MODULE} STEERBase ESD RAWDatabase Core Net RIO TreePlayer Tree)
 
-# Additional compilation flags
-set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")
+# Compile and link flags
+set(MODULE_COMPILE_FLAGS)
+set(MODULE_LINK_FLAGS)
+
+if(DATE_FOUND)
+    set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS}")
+    set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
+endif(DATE_FOUND)
+
+# Additional compilation and linking flags
+set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}")
 
 # System dependent: Modify the way the library is build
 if(${CMAKE_SYSTEM} MATCHES Darwin)
-    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
 endif(${CMAKE_SYSTEM} MATCHES Darwin)
 
+# Setting target compile and linking flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
+
 # Installation
 install(TARGETS ${MODULE}
         ARCHIVE DESTINATION lib

diff --git a/RAW/RAWDatarecOnline/CMakeLists.txt b/RAW/RAWDatarecOnline/CMakeLists.txt
index 69c5d1dc9359c7d29342d120cabc009cb4034411..0ae6651019d2537e3843d42420d75d73a7e9dec7 100644 (file)
--- a/RAW/RAWDatarecOnline/CMakeLists.txt
+++ b/RAW/RAWDatarecOnline/CMakeLists.txt
@@ -49,14 +49,27 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}
 add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
 target_link_libraries(${MODULE} ESD RAWDatabase RAWDatarec STEERBase Core)
 
-# Additional compilation flags
-set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")
+# Compile and link flags
+set(MODULE_COMPILE_FLAGS)
+set(MODULE_LINK_FLAGS)
+
+if(DATE_FOUND)
+    set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS}")
+    set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
+endif(DATE_FOUND)
+
+# Additional compilation and linking flags
+set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}")
 
 # System dependent: Modify the way the library is build
 if(${CMAKE_SYSTEM} MATCHES Darwin)
-    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
 endif(${CMAKE_SYSTEM} MATCHES Darwin)
 
+# Setting target compile and linking flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
+
 # Installation
 install(TARGETS ${MODULE}
         ARCHIVE DESTINATION lib

diff --git a/RAW/RAWDatasim/CMakeLists.txt b/RAW/RAWDatasim/CMakeLists.txt
index b81c647acb616572d8f66ce3900be5c003875745..ef9cdc380915991caee181efa167d62de1e9073a 100644 (file)
--- a/RAW/RAWDatasim/CMakeLists.txt
+++ b/RAW/RAWDatasim/CMakeLists.txt
@@ -50,14 +50,29 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}
 add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
 target_link_libraries(${MODULE} RAWDatabase STEERBase STEER Core)
 
-# Additional compilation flags
-set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")
+# Compile and link flags
+set(MODULE_COMPILE_FLAGS)
+set(MODULE_LINK_FLAGS)
+
+if(DATE_FOUND)
+    set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS}")
+    set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
+endif(DATE_FOUND)
+
+# Additional compilation and linking flags
+set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}")
 
 # System dependent: Modify the way the library is build
 if(${CMAKE_SYSTEM} MATCHES Darwin)
-    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
 endif(${CMAKE_SYSTEM} MATCHES Darwin)
 
+# Setting target compile and linking flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
+
+
+
 # Installation
 install(TARGETS ${MODULE}
         ARCHIVE DESTINATION lib

diff --git a/RAW/alimdc/CMakeLists.txt b/RAW/alimdc/CMakeLists.txt
index 1817ff9f8f5669e17bfb37280c0a451a4fa8f8a6..5d62dac811ac6f9c256049de946eed07b54ee14d 100644 (file)
--- a/RAW/alimdc/CMakeLists.txt
+++ b/RAW/alimdc/CMakeLists.txt
@@ -35,5 +35,26 @@ set(ROOTEXTRALIBS Geom VMC Minuit)
 add_executable(${MODULE} alimdc_main.cxx)
 target_link_libraries(${MODULE} STEERBase ESD MDC RAWDatabase RAWDatarec  ${ROOTEXTRALIBS} ${ROOT_LIBRARIES})
 
+# Compile and link flags
+set(MODULE_COMPILE_FLAGS)
+set(MODULE_LINK_FLAGS)
+
+if(DATE_FOUND)
+    set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS}")
+    set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
+endif(DATE_FOUND)
+
+# Additional compilation and linking flags
+set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}")
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Setting target compile and linking flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
+
 # Installation
 install(TARGETS ${MODULE} RUNTIME DESTINATION bin)

diff --git a/RAW/dateStream/CMakeLists.txt b/RAW/dateStream/CMakeLists.txt
index 3de3db63479fa3e7ca163b65ea23ecbefa935bef..dbdc52203b1811c7e1d1d6b5a6e02e1d3b2945dc 100644 (file)
--- a/RAW/dateStream/CMakeLists.txt
+++ b/RAW/dateStream/CMakeLists.txt
@@ -35,5 +35,26 @@ set(ROOTEXTRALIBS Geom VMC Minuit)
 add_executable(${MODULE} dateStream.cxx)
 target_link_libraries(${MODULE} STEERBase RAWDatabase ${ROOTEXTRALIBS} ${ROOT_LIBRARIES})
 
+# compile and link flags
+set(MODULE_COMPILE_FLAGS)
+set(MODULE_LINK_FLAGS)
+
+if(DATE_FOUND)
+    set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS}")
+    set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
+endif(DATE_FOUND)
+
+# Additional compilation and linking flags
+set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}")
+
+# System dependent: Modify the way the library is build
+if(${CMAKE_SYSTEM} MATCHES Darwin)
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
+endif(${CMAKE_SYSTEM} MATCHES Darwin)
+
+# Setting target compile and linking flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
+
 # Installation
 install(TARGETS ${MODULE} RUNTIME DESTINATION bin)

diff --git a/TPC/TPCbase/CMakeLists.txt b/TPC/TPCbase/CMakeLists.txt
index fe0ffb158963eeb741dc2a467f29c8aa691e774e..e49606f2e5b08d6c29a6aa2f8401a8ca57715857 100644 (file)
--- a/TPC/TPCbase/CMakeLists.txt
+++ b/TPC/TPCbase/CMakeLists.txt
@@ -109,12 +109,13 @@ generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
 
 # Generate the ROOT map
 # Dependecies
-set(LIBDEPS STEERBase STEER CDB ESD RAWDatabase RAWDatarec TPCrec Minuit Gui)
+set(LIBDEPS STEERBase STEER CDB ESD RAWDatabase RAWDatarec Minuit Gui)
 generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
 
 
 # Add a library to the project using the specified source files
 add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
+target_link_libraries(${MODULE} STEERBase STEER CDB ESD RAWDatabase RAWDatarec Minuit Gui)
 
 # Additional compilation flags
 set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")

diff --git a/TPC/TPCcalib/CMakeLists.txt b/TPC/TPCcalib/CMakeLists.txt
index 208b6dd068f0cc50bb5caade09ce26d4ec7c5056..df9638b949adca92a49019050b6981e52ce275b9 100644 (file)
--- a/TPC/TPCcalib/CMakeLists.txt
+++ b/TPC/TPCcalib/CMakeLists.txt
@@ -77,6 +77,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}
 
 # Add a library to the project using the specified source files
 add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
+target_link_libraries(${MODULE} STEERBase CDB ESD STEER ANALYSIS ANALYSISalice STAT RAWDatarec RAWDatabase TPCbase TPCrec Minuit)
 
 # Additional compilation flags
 set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")

diff --git a/TPC/TPCmon/CMakeLists.txt b/TPC/TPCmon/CMakeLists.txt
index 84f9ee227e2a9f15b724493b0ea157eff8b9fe9b..de6c74b01baf578c0cdc4146d1ce7a76f41ad3e7 100644 (file)
--- a/TPC/TPCmon/CMakeLists.txt
+++ b/TPC/TPCmon/CMakeLists.txt
@@ -62,15 +62,28 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}
 
 # Add a library to the project using the specified source files
 add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
+target_link_libraries(${MODULE} STEERBase ESD RAWDatabase RAWDatarec RAWDatarecOnline Gui)
 
-# Additional compilation flags
-set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")
+set(MODULE_COMPILE_FLAGS)
+set(MODULE_LINK_FLAGS)
+
+if(DATE_FOUND)
+    set(MODULE_COMPILE_FLAGS "${DATE_CFLAGS}")
+    set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
+endif(DATE_FOUND)
+
+# Additional compilation and linking flags
+set(MODULE_COMPILE_FLAGS "-O -g ${MODULE_COMPILE_FLAGS}")
 
 # System dependent: Modify the way the library is build
 if(${CMAKE_SYSTEM} MATCHES Darwin)
-    set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
 endif(${CMAKE_SYSTEM} MATCHES Darwin)
 
+# Setting target compile and linking flags
+set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
+set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
+
 # Installation
 install(TARGETS ${MODULE}
         ARCHIVE DESTINATION lib

diff --git a/TPC/TPCrec/CMakeLists.txt b/TPC/TPCrec/CMakeLists.txt
index 7d2cc70f71d499fa417ded8e48cbcb450e4c2877..3e773e3a583e1cd341beb5e974e8696cedfc276c 100644 (file)
--- a/TPC/TPCrec/CMakeLists.txt
+++ b/TPC/TPCrec/CMakeLists.txt
@@ -70,12 +70,13 @@ generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
 
 # Generate the ROOT map
 # Dependecies
-set(LIBDEPS STEERBase STEER CDB ESD RAWDatabase RAWDatarec ANALYSIS ANALYSISalice TPCbase TPCsim Graph)
+set(LIBDEPS STEERBase STEER CDB ESD RAWDatabase RAWDatarec ANALYSIS ANALYSISalice TPCbase TPCsim Graf)
 generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
 
 
 # Add a library to the project using the specified source files
 add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
+target_link_libraries(${MODULE}  STEERBase STEER CDB ESD RAWDatabase RAWDatarec ANALYSIS ANALYSISalice TPCbase TPCsim Graf)
 
 # Additional compilation flags
 set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")

diff --git a/TPC/TPCsim/CMakeLists.txt b/TPC/TPCsim/CMakeLists.txt
index a2de5ecc7735920f291ddfc89d0608ec3b0dccb2..491015a550395ab3590a288530899bc11aeca5c4 100644 (file)
--- a/TPC/TPCsim/CMakeLists.txt
+++ b/TPC/TPCsim/CMakeLists.txt
@@ -56,12 +56,13 @@ generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
 
 # Generate the ROOT map
 # Dependecies
-set(LIBDEPS STEERBase STEER CDB ESD RAWDatabase RAWDatarec RAWDatasim TPCbase TPCrec GenVector)
+set(LIBDEPS STEERBase STEER CDB ESD RAWDatabase RAWDatarec RAWDatasim TPCbase GenVector)
 generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
 
 
 # Add a library to the project using the specified source files
 add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
+target_link_libraries(${MODULE} STEERBase STEER CDB ESD RAWDatabase RAWDatarec RAWDatasim TPCbase GenVector)
 
 # Additional compilation flags
 set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")

diff --git a/TPC/TPCutil/CMakeLists.txt b/TPC/TPCutil/CMakeLists.txt
index aa0d163980ec607c40e4945dcdfe26ef3e60df42..d581a855955c45929b28ae08bca59c756614095f 100644 (file)
--- a/TPC/TPCutil/CMakeLists.txt
+++ b/TPC/TPCutil/CMakeLists.txt
@@ -57,6 +57,7 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}
 
 # Add a library to the project using the specified source files
 add_library(${MODULE} SHARED ${SRCS} G__${MODULE}.cxx)
+target_link_libraries(${MODULE} STEERBase STEER ESD CDB RAWDatabase RAWDatarec TPCbase Gui)
 
 # Additional compilation flags
 set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "-O -g")

diff --git a/cmake/FindDATE.cmake b/cmake/FindDATE.cmake
index dd54d7ad23ee9094edbc114b3865aabc40a23c70..76e9d32ae6282dd37d259b12e41eae6957aec40c 100644 (file)
--- a/cmake/FindDATE.cmake
+++ b/cmake/FindDATE.cmake
@@ -17,15 +17,16 @@
 # Requires: 
 #       - date-config has to be found in the PATH
 #       - Environment variables
-#               - DATE_ROOT
-#               - DATE_COMMON_DEFS
-#               - DATE_MONITOR_DIR
+#               - DATE_ROOT // try to not use
+#               - DATE_COMMON_DEFS // try to not use
+#               - DATE_MONITOR_DIR //try not to use
 # - DATE_VERSION - DATE version as reported by date-config
 # - DATE_VERSION_MAJOR
 # - DATE_VERSIOM_MINOR
 # - DATE_CONFIG - path to date-config script
 # - DATE_CFLAGS - cflags reported by date-config
 # - DATE_LDFLAGS - ldflags reported by date-config
+# - DATE_LIBS - DATE libs to be linked against to
 # - DATE_MONLIBS - monitorlibs reported by date-config
 
 find_program(DATE_CONFIG date-config)
@@ -44,33 +45,37 @@ if(DATE_CONFIG)
     message(STATUS "DATE version ${DATE_VERSION_MAJOR}.${DATE_VERSION_MINOR} found.")
     
     # Checking if the environment is properly set
-    if(NOT DEFINED ENV{DATE_ROOT})
-        message(FATAL_ERROR "date-config found. Please set DATE_ROOT environment variable")
-    else()
-        set(DATE_ROOT ENV{DATE_ROOT})
-        message(STATUS "DATE_ROOT found ${DATE_ROOT}")
-    endif()
+#    if(NOT DEFINED ENV{DATE_ROOT})
+#        message(FATAL_ERROR "date-config found. Please set DATE_ROOT environment variable")
+#    else()
+#        set(DATE_ROOT ENV{DATE_ROOT})
+#        message(STATUS "DATE_ROOT found ${DATE_ROOT}")
+#    endif()
 
-    if(NOT DEFINED ENV{DATE_COMMON_DEFS})
-        message(FATAL_ERROR "date-config found. Please set DATE_COMMON_DEFS environment variable")
-    else()
-        set(DATE_COMMON_DEFS ENV{DATE_COMMON_DEFS})
-        message(STATUS "DATE_COMMON_DEFS found ${DATE_COMMON_DEFS}")
-    endif()
+#    if(NOT DEFINED ENV{DATE_COMMON_DEFS})
+#        message(FATAL_ERROR "date-config found. Please set DATE_COMMON_DEFS environment variable")
+#    else()
+#        set(DATE_COMMON_DEFS ENV{DATE_COMMON_DEFS})
+#        message(STATUS "DATE_COMMON_DEFS found ${DATE_COMMON_DEFS}")
+#    endif()
 
-    if(NOT DEFINED ENV{DATE_MONITOR_DIR})
-        message(FATAL_ERROR "date-config found. Please set DATE_MONITOR_DIR environment variable")
-    else()
-        set(DATE_MONITOR_DIR ENV{DATE_MONITOR_DIR})
-        message(STATUS "DATE_MONITOR_DIR found ${DATE_MONITOR_DIR}")
-    endif()
+#    if(NOT DEFINED ENV{DATE_MONITOR_DIR})
+#        message(FATAL_ERROR "date-config found. Please set DATE_MONITOR_DIR environment variable")
+#    else()
+#        set(DATE_MONITOR_DIR ENV{DATE_MONITOR_DIR})
+#        message(STATUS "DATE_MONITOR_DIR found ${DATE_MONITOR_DIR}")
+#    endif()
 
     # setting the cflags
     execute_process(COMMAND ${DATE_CONFIG} --cflags OUTPUT_VARIABLE DATE_CFLAGS ERROR_VARIABLE error OUTPUT_STRIP_TRAILING_WHITESPACE )
     if(error)
         message(FATAL_ERROR "Error retrieving DATE cflags : ${error}")
     endif(error)
-    string(STRIP ${DATE_CFLAGS} DATE_CFLAGS)
+    
+    # If flags not empty we strip them
+    if(DATE_CFLAGS)
+        string(STRIP ${DATE_CFLAGS} DATE_CFLAGS)
+    endif()
     
     set(DATE_CFLAGS "-DALI_DATE ${DATE_CFLAGS}")
 
@@ -79,20 +84,34 @@ if(DATE_CONFIG)
     if(error)
         message(FATAL_ERROR "Error retrieving DATE ldflags : ${error}")
     endif(error)
-    string(STRIP ${DATE_LDFLAGS} DATE_LDFLAGS)
+    
+    # If the flags are not empty we strip them
+    if(DATE_LDFLAGS)
+        string(STRIP ${DATE_LDFLAGS} DATE_LDFLAGS)
+    endif()
+
+    # setting the libs
+    execute_process(COMMAND ${DATE_CONFIG} --libs OUTPUT_VARIABLE DATE_LIBS ERROR_VARIABLE error OUTPUT_STRIP_TRAILING_WHITESPACE )
+    if(error)
+        message(FATAL_ERROR "Error retrieving DATE libs : ${error}")
+    endif(error)
+    
+    # If the flags are not empty we strip them
+    if(DATE_LIBS)
+        string(STRIP ${DATE_LIBS} DATE_LIBS)
+    endif()
     
     # setting the monlibs
     execute_process(COMMAND ${DATE_CONFIG} --monitorlibs OUTPUT_VARIABLE DATE_MONLIBS ERROR_VARIABLE error OUTPUT_STRIP_TRAILING_WHITESPACE )
     if(error)
         message(FATAL_ERROR "Error retrieving DATE monitorlibs : ${error}")
     endif(error)
-    string(STRIP ${DATE_MONLIBS} DATE_MONLIBS)
-
-    # Set the proper compilation flags
-    set(CMAKE_C_FLAGS ${DATE_CFLAGS} ${CMAKE_C_FLAGS})
-    set(CMAKE_CXX_FLAGS ${DATE_CFLAGS} ${CMAKE_CXX_FLAGS})
-    set(CMAKE_SHARED_LINKER_FLAGS ${DATE_LDFLAGS} ${CMAKE_SHARED_LINKER_FLAGS})
     
+    # If the flags are not empty we strip them
+    if(DATE_MONLIBS)
+        string(STRIP ${DATE_MONLIBS} DATE_MONLIBS)
+    endif()
+
     set(DATE_FOUND TRUE)
 else()
     message(STATUS "DATE not found")