X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=d23f507c716e45e60637ea226f21f66fc136dd78;hb=3d79e89922e83ded1dd9fe7689d30b45567bd6ef;hp=9e6bcf6b08f0db89147de8026d279158e70c76da;hpb=b6b1679cfe492bd5b73e03410f82917bd9c3aa7b;p=unres.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e6bcf6..d23f507 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ project(UNRESPACK Fortran C)
 
 set(UNRES_MAJOR 3)
 set(UNRES_MINOR 5)
-set(UNRES_PATCH 1)
+set(UNRES_PATCH 2)
 set(UNRES_VERSION ${UNRES_MAJOR}.${UNRES_MINOR}.${UNRES_PATCH})
 
 #======================================
@@ -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,7 +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
@@ -179,12 +181,7 @@ add_subdirectory(source/lib/xdrf)
 #add_subdirectory(source/unres/src_MD)
 
 if(UNRES_WITH_MPI)
- if(UNRES_5D)
-# src-HCD-5D
-  add_subdirectory(source/cluster/wham/src-HCD-5D)
-  add_subdirectory(source/wham/src-HCD-5D)
-  add_subdirectory(source/unres/src-HCD-5D)
- else(UNRES_5D)
+ if(UNRES_NO5D)
 #    add_subdirectory(source/unres/src_MD-M)
 #    add_subdirectory(source/unres/src_MD_DFA)
 #    add_subdirectory(source/unres/src_CSA)
@@ -197,10 +194,15 @@ if(UNRES_WITH_MPI)
 #    add_subdirectory(source/cluster/wham/src-M)
     add_subdirectory(source/cluster/wham/src-M-SAXS-homology)
 #
- endif(UNRES_5D)
- if(NOT UNRES_DFA)
+ else(UNRES_NO5D)
+# src-HCD-5D
+  add_subdirectory(source/cluster/wham/src-HCD-5D)
+  add_subdirectory(source/wham/src-HCD-5D)
+  add_subdirectory(source/unres/src-HCD-5D)
+ endif(UNRES_NO5D)
+# 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)