Cleanup of the linking to avoid problems on Mac

diff --git a/RAW/alimdc/CMakeLists.txt b/RAW/alimdc/CMakeLists.txt
index a04d5f32092965f7179a5484d249e3cfac4d7bd3..c8cfd77a339325ac35587ddeef4070f7f9a53ed2 100644 (file)
--- a/RAW/alimdc/CMakeLists.txt
+++ b/RAW/alimdc/CMakeLists.txt
@@ -26,18 +26,12 @@ include_directories(${ROOT_INCLUDE_DIRS}
                     ${AliRoot_SOURCE_DIR}/STEER/STEERBase
                    )
 
-link_directories(${ROOT_LIBDIR})
-
-# ROOT libraries that are not in root-config --libs
-set(ROOT_DEPENDENCIES Geom VMC Minuit)
-set(ALIROOT_DEPENDENCIES STEERBase ESD MDC RAWDatabase RAWDatarec)
-
 # Create an object to be reused in case of static libraries 
 # Otherwise the sources will be compiled twice
 add_library(${MODULE}-object OBJECT alimdc_main.cxx)
 # Add a library to the project using the object
 add_executable(${MODULE} $<TARGET_OBJECTS:${MODULE}-object>)
-target_link_libraries(${MODULE} STEERBase ESD MDC RAWDatabase RAWDatarec ${ROOT_DEPENDENCIES} ${ROOT_LIBRARIES})
+target_link_libraries(${MODULE} STEERBase ESD MDC RAWDatabase RAWDatarec)
 
 # Compile and link flags
 set(MODULE_COMPILE_FLAGS)
@@ -48,14 +42,6 @@ if(DATE_FOUND)
     set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
 endif(DATE_FOUND)
 
-# Additional compilation and linking flags
-set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}")
-
-# System dependent: Modify the way the library is build
-if(${CMAKE_SYSTEM} MATCHES Darwin)
-    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
-endif(${CMAKE_SYSTEM} MATCHES Darwin)
-
 # Setting target compile and linking flags
 set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
 set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")
@@ -105,4 +91,4 @@ if(MDCRPM)
     # install RPM into $CMAKE_INSTALL_PREFIX/darpms
     install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/alimdc-rpm/RPMS/ DESTINATION mdcrpm PATTERN "\\.rpm")
 
-endif(MDCRPM)
\ No newline at end of file
+endif(MDCRPM)

diff --git a/RAW/dateStream/CMakeLists.txt b/RAW/dateStream/CMakeLists.txt
index 79991ddc007abece95e4a5771347a9b72b98bd46..69618d23fb4f51c23aeaa9c88b20a0e8d94207d5 100644 (file)
--- a/RAW/dateStream/CMakeLists.txt
+++ b/RAW/dateStream/CMakeLists.txt
@@ -18,24 +18,10 @@ set(MODULE dateStream)
 
 include_directories(${AliRoot_SOURCE_DIR}/${MODULE})
 
-# Aditional include folders in alphabetical order except ROOT
-include_directories(${ROOT_INCLUDE_DIRS}
-                    ${AliRoot_SOURCE_DIR}/RAW/RAWDatabase
-                    ${AliRoot_SOURCE_DIR}/RAW/RAWDatarec
-                    ${AliRoot_SOURCE_DIR}/STEER/STEERBase
-                   )
-
-
-link_directories(${ROOT_LIBDIR})
-
-# Aditional ROOT libraries that are not shoed by root-config --libs
-set(ROOTEXTRALIBS Geom VMC Minuit)
-
 # Add an executable to the project using the specified source files
 add_executable(${MODULE} dateStream.cxx)
-target_link_libraries(${MODULE} STEERBase RAWDatabase ${ROOTEXTRALIBS} ${ROOT_LIBRARIES})
 
-# compile and link flags
+# compile and link flags from DATE (probably not needed)
 set(MODULE_COMPILE_FLAGS)
 set(MODULE_LINK_FLAGS)
 
@@ -44,14 +30,6 @@ if(DATE_FOUND)
     set(MODULE_LINK_FLAGS "${DATE_LDFLAGS} ${DATE_LIBS}")
 endif(DATE_FOUND)
 
-# Additional compilation and linking flags
-set(MODULE_COMPILE_FLAGS " ${MODULE_COMPILE_FLAGS}")
-
-# System dependent: Modify the way the library is build
-if(${CMAKE_SYSTEM} MATCHES Darwin)
-    set(MODULE_LINK_FLAGS "-undefined dynamic_lookup ${MODULE_LINK_FLAGS}")
-endif(${CMAKE_SYSTEM} MATCHES Darwin)
-
 # Setting target compile and linking flags
 set_target_properties(${MODULE} PROPERTIES COMPILE_FLAGS "${MODULE_COMPILE_FLAGS}")
 set_target_properties(${MODULE} PROPERTIES LINK_FLAGS "${MODULE_LINK_FLAGS}")