Revert of a harmful change (A.Goel)
authorfca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 21 Jul 2011 12:40:33 +0000 (12:40 +0000)
committerfca <fca@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 21 Jul 2011 12:40:33 +0000 (12:40 +0000)
cmake/FindDATE.cmake

index f8c82e9..47e448a 100644 (file)
@@ -3,7 +3,7 @@
 # Author: Johny Jose (johny.jose@cern.ch)
 #         Port of previous Makefile build to cmake
 
-cmake_minimum_required(VERSION 2.8.4 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
 
 find_program(DATE_CONFIG date-config)
 message(STATUS "Check for Date : ${DATE_CONFIG}")
@@ -13,9 +13,10 @@ if(DATE_CONFIG)
   set(DATE_COMMON_DEFS $ENV{DATE_COMMON_DEFS})
   set(DATE_MONITOR_DIR $ENV{DATE_MONITOR_DIR})
   execute_process(COMMAND date-config --cflags OUTPUT_VARIABLE DATEFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
+  string(REGEX REPLACE "\"" "'" DATEFLAGS ${DATEFLAGS})
+  set(DATEFLAGS "-DALI_DATE ${DATEFLAGS}")
   execute_process(COMMAND date-config --monitorlibs OUTPUT_VARIABLE DMONLIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
 else()
   set(DATEFLAGS "-D${CMAKE_SYSTEM_NAME} -DDATE_SYS=${CMAKE_SYSTEM_NAME} -Dlong32='int' -Dlong64='long long' -DdatePointer='long'")
 endif(DATE_CONFIG)
-string ( REPLACE "\\" "" DATEFLAGS "${DATEFLAGS}" )
-message(STATUS "DATEFLAGS: ${DATEFLAGS}")
+