X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=cmake%2FFindDATE.cmake;h=ceb66e24c057b324e640e85ebe95716702adfe25;hb=eedaa08dfbc58f8479e99c0d0ed5a92c369a4221;hp=f8c82e9656394c5c196c52e98161fffb9eae4283;hpb=0a8abcad68b30cf11bb0c83a3a42cfb293f5480d;p=u%2Fmrichter%2FAliRoot.git diff --git a/cmake/FindDATE.cmake b/cmake/FindDATE.cmake index f8c82e96563..ceb66e24c05 100644 --- a/cmake/FindDATE.cmake +++ b/cmake/FindDATE.cmake @@ -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) - execute_process(COMMAND date-config --monitorlibs OUTPUT_VARIABLE DMONLIBS OUTPUT_STRIP_TRAILING_WHITESPACE) + string(REGEX REPLACE "\"" "'" DATEFLAGS ${DATEFLAGS}) + set(DATEFLAGS "-DALI_DATE ${DATEFLAGS}") + execute_process(COMMAND date-config --monitorlibs=dyn 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}") +