PHOS: CPV PED DA added

[u/mrichter/AliRoot.git] / PHOS / PHOSbase / CMakeLists.txt

diff --git a/PHOS/PHOSbase/CMakeLists.txt b/PHOS/PHOSbase/CMakeLists.txt
index 0c7bf9904cb1361a0789d90b0879b296408fe54c..03782a4df476bf2040ff092d471455fec62bc74e 100644 (file)
--- a/PHOS/PHOSbase/CMakeLists.txt
+++ b/PHOS/PHOSbase/CMakeLists.txt
@@ -20,7 +20,7 @@ set(MODULE PHOSbase)
 include_directories(${AliRoot_SOURCE_DIR}/PHOS/${MODULE})
 
 # Additional include folders in alphabetical order except ROOT
-include_directories(${ROOT_INCLUDE_DIRS}
+include_directories(${ROOT_INCLUDE_DIR}
                     ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase
                     ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec
                     ${AliRoot_SOURCE_DIR}/RAW/RAWDatasim
@@ -39,6 +39,11 @@ set(SRCS
     AliPHOSClusterizerv1.cxx
     AliPHOSCpvCalibData.cxx
     AliPHOSCpvRecPoint.cxx
+    AliPHOSCpv3GConnection.cxx
+    AliPHOSCpvParam.cxx
+    AliPHOSCpvPedProducer.cxx
+    AliPHOSCpvRawDigiProducer.cxx
+    AliPHOSCpvRawStream.cxx
     AliPHOSDigit.cxx
     AliPHOSDigitizer.cxx
     AliPHOSEmcBadChannelsMap.cxx
@@ -102,14 +107,20 @@ generate_rootmap("${MODULE}" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}
 # Create an object to be reused in case of static libraries 
 # Otherwise the sources will be compiled twice
 add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx)
+# Follow headers dependencies
+add_dependencies(${MODULE}-object ${ALIROOT_DEPENDENCIES})
 # Add a library to the project using the object
 add_library(${MODULE} SHARED $<TARGET_OBJECTS:PHOSbase-object>)
 
 # Linking
 target_link_libraries(${MODULE} ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES})
 
+# Setting the correct headers for the object as gathered from the dependencies
+target_include_directories(${MODULE}-object PUBLIC $<TARGET_PROPERTY:${MODULE},INCLUDE_DIRECTORIES>)
+set_target_properties(${MODULE}-object PROPERTIES COMPILE_DEFINITIONS $<TARGET_PROPERTY:${MODULE},COMPILE_DEFINITIONS>)
+
 # Additional compilation flags
-set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g -fPIC")
+set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS " ")
 
 # System dependent: Modify the way the library is build
 if(${CMAKE_SYSTEM} MATCHES Darwin)
@@ -131,6 +142,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