X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=d23f507c716e45e60637ea226f21f66fc136dd78;hb=refs%2Fheads%2Fdevel;hp=aa2848011a6737f060ba72e7e192b09b6f0d5087;hpb=05c1789531ec3f44dfebf41b426cb1204329e7ff;p=unres.git diff --git a/CMakeLists.txt b/CMakeLists.txt index aa28480..d23f507 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,8 @@ MACRO (TODAY RESULT) EXECUTE_PROCESS(COMMAND "date" "/T" OUTPUT_VARIABLE ${RESULT}) string(REGEX REPLACE "(..)/(..)/..(..).*" "\\3\\2\\1" ${RESULT} ${${RESULT}}) ELSEIF(UNIX) - EXECUTE_PROCESS(COMMAND "date" OUTPUT_VARIABLE ${RESULT}) - string(REGEX REPLACE "(...) (...) (.+) (..:..:..) (.+) (....).*" "\\1 \\2 \\3 \\4 \\5 \\6" ${RESULT} ${${RESULT}}) + EXECUTE_PROCESS(COMMAND "date" "--rfc-2822" OUTPUT_VARIABLE ${RESULT}) + string(REGEX REPLACE "\n" " " ${RESULT} ${${RESULT}}) ELSE (WIN32) MESSAGE(SEND_ERROR "date not implemented") SET(${RESULT} 000000) @@ -134,8 +134,9 @@ option(UNRES_WITH_MPI "Choose whether or not to use MPI library" ON ) #option(UNRES_NA_MMCE "Kompilujemy na mmmce?" OFF ) option(UNRES_DFA "Choose whether or not to use DFA" OFF ) -option(UNRES_5D "Choose whether or not to use HCD-5D" OFF ) +option(UNRES_5D "Choose whether or not to use HCD-5D" ON ) option(UNRES_NO5D "Choose the old code" OFF ) +option(UNRES_SUMSLD "Choose SUMSLD (ON) or LBFGS (OFF, default)" OFF ) #================================= # MPI stuff