Fix for definitions for CINT
authoragrigora <alina.grigoras@cern.ch>
Fri, 14 Nov 2014 18:53:09 +0000 (19:53 +0100)
committeragrigora <alina.grigoras@cern.ch>
Mon, 15 Dec 2014 12:51:56 +0000 (13:51 +0100)
EVE/CMakeLists.txt
EVE/alieve_main/CMakeLists.txt
STEER/AOD/CMakeLists.txt
cmake/CMakeALICE.cmake
cmake/FindROOT.cmake

index 0ae33c3..448e651 100644 (file)
@@ -17,6 +17,7 @@
 add_subdirectory(EveBase)
 add_subdirectory(EveDet)
 add_subdirectory(EveHLT)
+
 # EVE executables
 #add_subdirectory(alieve_main)
 
index 38ae6c1..8eb2399 100644 (file)
@@ -33,10 +33,10 @@ set(SRCS
 string(REPLACE ".cxx" ".h" HDRS "${SRCS}")
 
 add_executable(alieve ${SRCS})
-target_link_libraries(alieve STEERBase STEER ESD CDB AOD RAWDatabase RAWDatarec ANALYSIS ANALYSISalice ITSbase ITSrec TPCbase TPCrec TPCsim EveBase Core Eve Rint)
+target_link_libraries(alieve STEERBase EveBase)
 
 if(ZEROMQ_FOUND)
-    target_link_libraries(MONITORzmq)
+    target_link_libraries(alieve MONITORzmq)
     add_definitions(-DZMQ)
 endif(ZEROMQ_FOUND)
 
index fb39854..0e90ff7 100644 (file)
@@ -64,6 +64,7 @@ set(SRCS
     AliAODVertex.cxx
     AliAODVZERO.cxx
     AliAODZDC.cxx
+    AliNanoAODHeader.cxx
     AliNanoAODTrackMapping.cxx
    )
 
index 5d5a398..43bb57f 100644 (file)
@@ -35,10 +35,14 @@ macro(generate_dictionary DNAME LDNAME DHDRS DINCDIRS)
 #    message(STATUS "${DHDRS} ${LDNAME}")
 #    message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}")
     
+    # Get the definitions from the directory to be sent to CINT
+    get_directory_property(tmpdirdefs DEFINITIONS)
+    string(REPLACE " " ";" tmpdirdefs ${tmpdirdefs})
+
     add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/G__${DNAME}.cxx ${CMAKE_CURRENT_BINARY_DIR}/G__${DNAME}.h
                        COMMAND LD_LIBRARY_PATH=${ROOT_LIBDIR}:$ENV{LD_LIBRARY_PATH} ${ROOT_CINT}
                        ARGS -f ${CMAKE_CURRENT_BINARY_DIR}/G__${DNAME}.cxx -c -p 
-                       ${INCLUDE_PATH} 
+                       ${tmpdirdefs} ${INCLUDE_PATH} 
                        ${DHDRS} ${LDNAME}
                        DEPENDS ${DHDRS} ${LDNAME} ${ROOT_CINT}
                        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
index 53455a8..e83902f 100644 (file)
@@ -139,14 +139,28 @@ if(ROOTSYS)
     if(error)
         message(FATAL_ERROR "Error checking if ROOT was build with AliEn support: ${error}")
     endif(error)
-    string(STRIP ${ROOT_HASALIEN} ROOT_HASALIEN)
+    
+    #if defined
+    if(ROOT_HASALIEN)
+        string(STRIP ${ROOT_HASALIEN} ROOT_HASALIEN)
+        if(ROOT_HASALIEN STREQUAL "yes")
+            add_definitions(-DWITHALIEN)
+        endif()
+    endif(ROOT_HASALIEN)
 
     # Checking for xml support
     execute_process(COMMAND ${ROOT_CONFIG} --has-xml OUTPUT_VARIABLE ROOT_HASXML ERROR_VARIABLE error OUTPUT_STRIP_TRAILING_WHITESPACE )
     if(error)
         message(FATAL_ERROR "Error checking if ROOT was build with xml support: ${error}")
     endif(error)
-    string(STRIP ${ROOT_HASXML} ROOT_HASXML)
+    
+    # if defined
+    if(ROOT_HASXML)
+        string(STRIP ${ROOT_HASXML} ROOT_HASXML)
+        if(ROOT_HASXML STREQUAL "yes")
+            add_definitions(-DWITHXML)
+        endif()
+    endif(ROOT_HASXML)
 
     # Checking for OpenGL support
     execute_process(COMMAND ${ROOT_CONFIG} --has-opengl OUTPUT_VARIABLE ROOT_HASOPENGL ERROR_VARIABLE error OUTPUT_STRIP_TRAILING_WHITESPACE )