X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=689bb9cb3b66cf1346b78a35357cb3844c9cdb88;hb=refs%2Fheads%2Fhomology;hp=699a92a3c2036854a487530d7a00e38c5d3bad76;hpb=456d8c7a2025617a7bd0f812eb7ba60a99e95856;p=unres.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 699a92a..689bb9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,8 +20,10 @@ 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" "+'%D %R:%S'" OUTPUT_VARIABLE ${RESULT})
+        string(REGEX REPLACE "'" ""  ${RESULT} ${${RESULT}})
+        string (STRIP ${${RESULT}} ${RESULT})
+#        string(TIMESTAMP ${RESULT})
     ELSE (WIN32)
         MESSAGE(SEND_ERROR "date not implemented")
         SET(${RESULT} 000000)
@@ -116,13 +118,13 @@ set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/bin" CACHE PATH "Binary install di
 
 # Set force field
 if (NOT UNRES_FF)
-  set(UNRES_MD_FF "GAB" CACHE STRING "Choose the force field, options are: GAB E0LL2Y" )
+  set(UNRES_MD_FF "E0LL2Y" CACHE STRING "Choose the force field, options are: GAB E0LL2Y" )
   set_property(CACHE UNRES_MD_FF PROPERTY STRINGS "GAB" "E0LL2Y")
 endif (NOT UNRES_FF)
 
 # Set CSA version force field
 if (NOT UNRES_CSA_FF)
-  set(UNRES_CSA_FF "4P" CACHE STRING "Choose the CSA version force field, options are: CASP3 ALPHA BETA ALPHABETA CASP5 3P 4P" )
+  set(UNRES_CSA_FF "E0LL2Y" CACHE STRING "Choose the CSA version force field, options are: CASP3 ALPHA BETA ALPHABETA CASP5 3P 4P" )
   set_property(CACHE UNRES_CSA_FF PROPERTY STRINGS "CASP3" "ALPHA" "BETA" "ALPHABETA" "CASP5" "3P" "4P" ) 
 endif (NOT UNRES_CSA_FF)
 
@@ -133,6 +135,7 @@ option(UNRES_WITH_MPI "Choose whether or not to use MPI library" ON )
 # Piasek cluster devel stuff
 option(UNRES_NA_MMCE "Kompilujemy na mmmce?" OFF )
 
+option(UNRES_DFA "Choose whether or not to use DFA" OFF )
 
 #=================================
 # MPI stuff
@@ -211,5 +214,6 @@ else()
   add_subdirectory(source/cluster/unres/src)
   add_subdirectory(source/xdrfpdb/src)
   add_subdirectory(source/xdrfpdb/src-M)
+  add_subdirectory(source/unres-dock)
 endif(UNRES_NA_MMCE)