set(UNRES_MAJOR 3)
set(UNRES_MINOR 5)
-set(UNRES_PATCH 0)
+set(UNRES_PATCH 2)
set(UNRES_VERSION ${UNRES_MAJOR}.${UNRES_MINOR}.${UNRES_PATCH})
#======================================
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)
#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" ON )
+option(UNRES_NO5D "Choose the old code" OFF )
+option(UNRES_SUMSLD "Choose SUMSLD (ON) or LBFGS (OFF, default)" OFF )
#=================================
# MPI stuff
#add_subdirectory(source/unres/src_MD)
if(UNRES_WITH_MPI)
+ if(UNRES_NO5D)
# add_subdirectory(source/unres/src_MD-M)
# add_subdirectory(source/unres/src_MD_DFA)
# add_subdirectory(source/unres/src_CSA)
# add_subdirectory(source/cluster/wham/src)
# add_subdirectory(source/cluster/wham/src-M)
add_subdirectory(source/cluster/wham/src-M-SAXS-homology)
+#
+ 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(UNRES_WITH_MPI)
#add_subdirectory(source/unres/src_MIN)
add_subdirectory(source/xdrfpdb/src-M)
#add_subdirectory(source/maxlik/src_CSA)
-if(NOT UNRES_DFA)
-add_subdirectory(source/unres-dock)
-endif(NOT UNRES_DFA)
+