STEER/* public include folders

diff --git a/STEER/AOD/CMakeLists.txt b/STEER/AOD/CMakeLists.txt
index 1505681a0dedf5077648002506e25f85054dd33a..7ea3f782f3a8be1129970df0eef7a04d23414594 100644 (file)
--- a/STEER/AOD/CMakeLists.txt
+++ b/STEER/AOD/CMakeLists.txt
@@ -96,8 +96,11 @@ add_library(${MODULE} SHARED $<TARGET_OBJECTS:AOD-object>)
 # library dependecies
 target_link_libraries(${MODULE} ${ROOT_DEPENDENCIES} ${ALIROOT_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)

diff --git a/STEER/CDB/CMakeLists.txt b/STEER/CDB/CMakeLists.txt
index 283235794c058ece314dffa44f479aab51b497d5..25915c39a9e851e616ce89774143d8e3d2a98c3e 100644 (file)
--- a/STEER/CDB/CMakeLists.txt
+++ b/STEER/CDB/CMakeLists.txt
@@ -71,15 +71,18 @@ 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(CDB-object OBJECT ${SRCS} G__${MODULE}.cxx)
+add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx)
 # Add a library to the project using the object
-add_library(CDB SHARED $<TARGET_OBJECTS:CDB-object>)
+add_library(${MODULE} SHARED $<TARGET_OBJECTS:CDB-object>)
 
 # Linking library
 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 "-fPIC -O -g")
+set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g")
 
 # System dependent: Modify the way the library is build
 if(${CMAKE_SYSTEM} MATCHES Darwin)

diff --git a/STEER/ESD/CMakeLists.txt b/STEER/ESD/CMakeLists.txt
index 7bba85439636d4138977133a4d98504193c5a618..39b158cf6b3936ea1e5ca643fade77f8d33019a2 100644 (file)
--- a/STEER/ESD/CMakeLists.txt
+++ b/STEER/ESD/CMakeLists.txt
@@ -118,14 +118,17 @@ generate_rootmap("ESD" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDe
 
 # Create an object to be reused in case of static libraries 
 # Otherwise the sources will be compiled twice
-add_library(ESD-object OBJECT ${SRCS} G__${MODULE}.cxx)
+add_library(${MODULE}-object OBJECT ${SRCS} G__${MODULE}.cxx)
 
 # Add a library to the project using the object
-add_library(ESD SHARED $<TARGET_OBJECTS:ESD-object>)
-target_link_libraries(ESD ${ALIROOT_DEPENDENCIES} ${ROOT_DEPENDENCIES})
+add_library(${MODULE} SHARED $<TARGET_OBJECTS:ESD-object>)
+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 for the object
-set_target_properties(ESD-object PROPERTIES COMPILE_FLAGS "-fPIC -O -g")
+set_target_properties(ESD-object PROPERTIES COMPILE_FLAGS "-O -g")
 
 # System dependent: Modify the way the library is build
 if(${CMAKE_SYSTEM} MATCHES Darwin)

diff --git a/STEER/STEER/CMakeLists.txt b/STEER/STEER/CMakeLists.txt
index d37596d375bfa13934a9deca3441bb474f66ad8c..cc3bb3ebbee8f004d47688b27f053c16b6826bbf 100644 (file)
--- a/STEER/STEER/CMakeLists.txt
+++ b/STEER/STEER/CMakeLists.txt
@@ -179,10 +179,14 @@ add_library(STEER-object OBJECT ${SRCS} G__${MODULE}.cxx)
 # Add a library to the project using the object
 add_library(STEER SHARED $<TARGET_OBJECTS:STEER-object>)
 
-# Additional compilation flags
-set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-fPIC -O -g")
 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")
+
 # System dependent: Modify the way the library is build
 if(${CMAKE_SYSTEM} MATCHES Darwin)
     set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")

diff --git a/STEER/STEERBase/CMakeLists.txt b/STEER/STEERBase/CMakeLists.txt
index 74960e4ec41f0b67e11906224bdaf1198cbbd6bd..e80a1a3042610e0ab97775456a19fa6653009061 100644 (file)
--- a/STEER/STEERBase/CMakeLists.txt
+++ b/STEER/STEERBase/CMakeLists.txt
@@ -149,9 +149,12 @@ set(LIBDEPS Core EG Geom Gpad Graf3d Graf Hist MathCore Matrix Minuit Net Physic
 generate_rootmap("STEERBase" "${LIBDEPS}" "${CMAKE_CURRENT_SOURCE_DIR}/${MODULE}LinkDef.h")
 
 # Additional compilation flags for the object
-set_target_properties(STEERBase-object PROPERTIES COMPILE_FLAGS "-fPIC -O -g")
+set_target_properties(${MODULE}-object PROPERTIES COMPILE_FLAGS "-O -g")
 # Linking the library, not the object
-target_link_libraries(STEERBase Core EG Geom Gpad Graf3d Graf Hist MathCore Matrix Minuit Net Physics RIO Tree VMC)
+target_link_libraries(${MODULE} Core EG Geom Gpad Graf3d Graf Hist MathCore Matrix Minuit Net Physics RIO Tree VMC)
+
+# Public include folders that will be propagated to the dependecies
+target_include_directories(${MODULE} PUBLIC ${incdirs})
 
 # System dependent: Modify the way the library is build
 if(${CMAKE_SYSTEM} MATCHES Darwin)