Final TOF DAs
authoragrigora <alina.grigoras@cern.ch>
Tue, 25 Nov 2014 16:01:36 +0000 (17:01 +0100)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:52:01 +0000 (13:52 +0100)
TOF/DA/CMakeLists.txt
TOF/TOFbase/CMakeLists.txt
cmake/FindDATE.cmake

index e895de3..5187934 100644 (file)
@@ -18,11 +18,8 @@ include_directories(${AliRoot_SOURCE_DIR}/TOF/DA)
 
 # Additional include folders in alphabetical order
 include_directories(
-                    ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase
                     ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec
-                    ${AliRoot_SOURCE_DIR}/STEER/ESD
                     ${AliRoot_SOURCE_DIR}/STEER/STEER
-                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
                     ${AliRoot_SOURCE_DIR}/TOF/TOFbase
                    )
 
index 5e2103b..12ec656 100644 (file)
@@ -108,8 +108,11 @@ add_library(${MODULE} SHARED $<TARGET_OBJECTS:TOFbase-object>)
 # Linking
 target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES})
 
+# Public include folders that will be propagated to the dependecies
+target_include_directories(${MODULE} PUBLIC ${incdirs})
+
 # Additional compilation flags
-set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC")
+set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g")
 
 # System dependent: Modify the way the library is build
 if(${CMAKE_SYSTEM} MATCHES Darwin)
@@ -131,6 +134,10 @@ if(ALIROOT_STATIC)
     # list of shared dependencies / the name of the variable containing the list of static ones
     generate_static_dependencies("${ALIROOT_DEPENDENCIES}" "STATIC_ALIROOT_DEPENDENCIES")
     target_link_libraries(${MODULE}-static ${STATIC_ALIROOT_DEPENDENCIES} Root)
+
+    # Public include folders that will be propagated to the dependecies
+    target_include_directories(${MODULE}-static PUBLIC ${incdirs})
+
     set_target_properties(${MODULE}-static PROPERTIES LINK_FLAGS "-Wl,--whole-archive")
 
     # Installation
index 08a90d0..0099368 100644 (file)
@@ -119,7 +119,6 @@ if(DATE_CONFIG)
     string(REGEX MATCHALL "[-]L[^- ]+" DATE_LIBRARIES_PATH_TMP ${DATE_LIBS})
     string(REGEX REPLACE "[-]L" ";" DATE_LIBRARIES_PATH_TMP ${DATE_LIBRARIES_PATH_TMP})
     find_date_libraries(DATE_LIBRARIES "${DATE_LIBRARIES_TMP}" "${DATE_LIBRARIES_PATH_TMP}")
-    message(STATUS "DATE LIBs ${DATE_LIBRARIES}")
     
     # Fix for mysql bug https://bugs.launchpad.net/percona-server/+bug/1287374
     set(DATE_LIBS "${DATE_LIBS} -L/usr/lib64/mysql/")
@@ -154,7 +153,6 @@ if(DATE_CONFIG)
     string(REGEX REPLACE "[-]L" ";" DATE_MONLIBRARIES_PATH_TMP ${DATE_MONLIBRARIES_PATH_TMP})
     find_date_libraries(DATE_MONLIBRARIES "${DATE_MONLIBRARIES_TMP}" "${DATE_MONLIBRARIES_PATH_TMP}")
     set(DATE_MONLIBRARIES ${DATE_STATICMON} ${DATE_MONLIBRARIES})
-    message(STATUS "MONSTATIC ${DATE_STATICMON}")
     
     # Fix for mysql bug https://bugs.launchpad.net/percona-server/+bug/1287374
     set(DATE_MONLIBS "${DATE_MONLIBS} -L/usr/lib64/mysql/")
@@ -179,7 +177,6 @@ if(DATE_CONFIG)
     string(REGEX MATCHALL "[-]L[^- ]+" DATE_RCPROXYLIBRARIES_PATH_TMP ${DATE_RCPROXYLIBS})
     string(REGEX REPLACE "[-]L" ";" DATE_RCPROXYLIBRARIES_PATH_TMP ${DATE_RCPROXYLIBRARIES_PATH_TMP})
     find_date_libraries(DATE_RCPROXYLIBRARIES "${DATE_RCPROXYLIBRARIES_TMP}" "${DATE_RCPROXYLIBRARIES_PATH_TMP}")
-    message(STATUS "DATE RCLIBs ${DATE_RCPROXYLIBRARIES}")
 
     # setting the monlibs
     execute_process(COMMAND ${DATE_CONFIG} --monitorlibs=dyn OUTPUT_VARIABLE DATE_DYNMONLIBS ERROR_VARIABLE error OUTPUT_STRIP_TRAILING_WHITESPACE )
@@ -192,7 +189,6 @@ if(DATE_CONFIG)
         string(STRIP ${DATE_DYNMONLIBS} DATE_DYNMONLIBS)
     endif()
 
-
     set(DATE_FOUND TRUE)
 else()
     message(STATUS "DATE not found")