Fixes for object target dependencies

[u/mrichter/AliRoot.git] / MUON / MUONbase / CMakeLists.txt

diff --git a/MUON/MUONbase/CMakeLists.txt b/MUON/MUONbase/CMakeLists.txt
index 3c075406af3a7821775f9b29f255660071369369..01bd62bf68327780dd3eb2dc2a49ea9ab59a5d36 100644 (file)
--- a/MUON/MUONbase/CMakeLists.txt
+++ b/MUON/MUONbase/CMakeLists.txt
@@ -99,8 +99,12 @@ add_library(${MODULE} SHARED $<TARGET_OBJECTS:MUONbase-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)
@@ -122,6 +126,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