Correct use of ROOT_INCLUDE_DIR

[u/mrichter/AliRoot.git] / cmake / FindDATE.cmake

diff --git a/cmake/FindDATE.cmake b/cmake/FindDATE.cmake
index 08a90d0aadf2069c7762bd43c44596a504f4360f..ad8c03e18efa01c231201c7ea8da3487daa8456f 100644 (file)
--- a/cmake/FindDATE.cmake
+++ b/cmake/FindDATE.cmake
@@ -62,6 +62,12 @@ endfunction(find_date_libraries _output library_list library_paths)
 
 # DATE_CONFIG set from the configuration
 if(DATE_CONFIG)
+
+    # Setting DIMDIR, ODIR and ROOTSYS in the environment, they are needed by date-config
+    set(ENV{DIMDIR} ${DIMDIR})
+    set(ENV{ODIR} ${ODIR})
+    set(ENV{ROOTSYS} ${ROOTSYS})
+
     # Checking DATE version
     execute_process(COMMAND ${DATE_CONFIG} --version OUTPUT_VARIABLE DATE_VERSION ERROR_VARIABLE error OUTPUT_STRIP_TRAILING_WHITESPACE )
     if(error)
@@ -119,7 +125,6 @@ if(DATE_CONFIG)
     string(REGEX MATCHALL "[-]L[^- ]+" DATE_LIBRARIES_PATH_TMP ${DATE_LIBS})
     string(REGEX REPLACE "[-]L" ";" DATE_LIBRARIES_PATH_TMP ${DATE_LIBRARIES_PATH_TMP})
     find_date_libraries(DATE_LIBRARIES "${DATE_LIBRARIES_TMP}" "${DATE_LIBRARIES_PATH_TMP}")
-    message(STATUS "DATE LIBs ${DATE_LIBRARIES}")
     
     # Fix for mysql bug https://bugs.launchpad.net/percona-server/+bug/1287374
     set(DATE_LIBS "${DATE_LIBS} -L/usr/lib64/mysql/")
@@ -154,7 +159,6 @@ if(DATE_CONFIG)
     string(REGEX REPLACE "[-]L" ";" DATE_MONLIBRARIES_PATH_TMP ${DATE_MONLIBRARIES_PATH_TMP})
     find_date_libraries(DATE_MONLIBRARIES "${DATE_MONLIBRARIES_TMP}" "${DATE_MONLIBRARIES_PATH_TMP}")
     set(DATE_MONLIBRARIES ${DATE_STATICMON} ${DATE_MONLIBRARIES})
-    message(STATUS "MONSTATIC ${DATE_STATICMON}")
     
     # Fix for mysql bug https://bugs.launchpad.net/percona-server/+bug/1287374
     set(DATE_MONLIBS "${DATE_MONLIBS} -L/usr/lib64/mysql/")
@@ -179,7 +183,6 @@ if(DATE_CONFIG)
     string(REGEX MATCHALL "[-]L[^- ]+" DATE_RCPROXYLIBRARIES_PATH_TMP ${DATE_RCPROXYLIBS})
     string(REGEX REPLACE "[-]L" ";" DATE_RCPROXYLIBRARIES_PATH_TMP ${DATE_RCPROXYLIBRARIES_PATH_TMP})
     find_date_libraries(DATE_RCPROXYLIBRARIES "${DATE_RCPROXYLIBRARIES_TMP}" "${DATE_RCPROXYLIBRARIES_PATH_TMP}")
-    message(STATUS "DATE RCLIBs ${DATE_RCPROXYLIBRARIES}")
 
     # setting the monlibs
     execute_process(COMMAND ${DATE_CONFIG} --monitorlibs=dyn OUTPUT_VARIABLE DATE_DYNMONLIBS ERROR_VARIABLE error OUTPUT_STRIP_TRAILING_WHITESPACE )
@@ -192,6 +195,10 @@ if(DATE_CONFIG)
         string(STRIP ${DATE_DYNMONLIBS} DATE_DYNMONLIBS)
     endif()
 
+    # unsetting all environment variables
+    unset(ENV{DIMDIR})
+    unset(ENV{ODIR})
+    unset(ENV{ROOTSYS})
 
     set(DATE_FOUND TRUE)
 else()