Fix after the rebase of the master
authoragrigora <alina.grigoras@cern.ch>
Fri, 28 Nov 2014 14:16:58 +0000 (15:16 +0100)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:52:03 +0000 (13:52 +0100)
FIT/FITsim/AliFITv2.cxx [moved from FIT/AliFITv2.cxx with 100% similarity]
FIT/FITsim/AliFITv2.h [moved from FIT/AliFITv2.h with 100% similarity]
TRD/TRDrec/CMakeLists.txt
TRD/TRDsim/CMakeLists.txt

similarity index 100%
rename from FIT/AliFITv2.cxx
rename to FIT/FITsim/AliFITv2.cxx
similarity index 100%
rename from FIT/AliFITv2.h
rename to FIT/FITsim/AliFITv2.h
index 1731774..1ce6588 100644 (file)
@@ -68,6 +68,7 @@ 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>)
 
 # Public include folders that will be propagated to the dependecies
 target_include_directories(${MODULE} PUBLIC ${incdirs})
index 09a18f3..67fff5e 100644 (file)
@@ -61,7 +61,7 @@ string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
 get_directory_property(incdirs INCLUDE_DIRECTORIES)
 generate_dictionary("${MODULE}" "${MODULE}LinkDef.h" "${HDRS}" "${incdirs}")
 
-set(ROOT_DEPENDENCIES Core Geom Gpad Hist MathCore Physics RIO RooFit Tree VMC)
+set(ROOT_DEPENDENCIES Core Geom Gpad Hist MathCore Physics RIO Tree VMC)
 set(ALIROOT_DEPENDENCIES STEERBase STEER ESD RAWDatarec RAWDatabase TRDbase TRDrec T0base TOFbase TOFsim VZERObase)
 
 # Generate the ROOT map
@@ -80,6 +80,10 @@ add_library(${MODULE} SHARED $<TARGET_OBJECTS:TRDsim-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>)
+
 # Public include folders that will be propagated to the dependecies
 target_include_directories(${MODULE} PUBLIC ${incdirs})