PAR: install PARfiles (if they were created)

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

diff --git a/cmake/FindDATE.cmake b/cmake/FindDATE.cmake
index 2bf1f12cddb47da08d37b14185edbbcf810988fe..21ac9250557ffb228bf130b1f14312a4125a8595 100644 (file)
--- a/cmake/FindDATE.cmake
+++ b/cmake/FindDATE.cmake
@@ -28,7 +28,8 @@
 # - DATE_LDFLAGS - ldflags reported by date-config
 # - DATE_LIBS - DATE libs to be linked against to reported by date-config --libs
 # - DATE_LIBRARIES - DATE libs as as list as extracted from date-config --libs
-# - DATE_MONLIBS - monitorlibs reported by date-config --monitorlibs
+# - DATE_MONLIBS - static monitorlibs reported by date-config --monitorlibs without shift
+# - DATE_DYNMONLIBS - dynamic monitorlibs reported by date-config --monitorlibs without shift
 # - DATE_MONLIBRARIES - DATE monitor libs as a list extracted from the date-config --monitorlibs
 # - DATE_STATICMON - DATE static monitor libs needed by the DA
 # - DATE_RCPROXYLIBS - rcproxylibs reported by date-config --rcproxylibs
@@ -61,6 +62,11 @@ 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)
@@ -118,7 +124,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/")
@@ -153,12 +158,11 @@ 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/")
 
-    # setting the monlibs
+    # setting the rclibs
     execute_process(COMMAND ${DATE_CONFIG} --rcproxylibs OUTPUT_VARIABLE DATE_RCPROXYLIBS ERROR_VARIABLE error OUTPUT_STRIP_TRAILING_WHITESPACE )
     if(error)
         message(FATAL_ERROR "Error retrieving DATE rcproxylibs")
@@ -178,7 +182,22 @@ 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 )
+    if(error)
+        message(FATAL_ERROR "Error retrieving DATE monitorlibs : ${error}")
+    endif(error)
+    
+    # If the flags are not empty we strip them
+    if(DATE_DYNMONLIBS)
+        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()