czytanie opcji

[unres.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3681243..d23f507 100644 (file)
--- 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
@@ -199,9 +200,9 @@ if(UNRES_WITH_MPI)
   add_subdirectory(source/wham/src-HCD-5D)
   add_subdirectory(source/unres/src-HCD-5D)
  endif(UNRES_NO5D)
- if(NOT UNRES_DFA)
+# if(NOT UNRES_DFA)
    add_subdirectory(source/unres-dock)
- endif(NOT UNRES_DFA)
+# endif(NOT UNRES_DFA)
 endif(UNRES_WITH_MPI)
 
 #add_subdirectory(source/unres/src_MIN)