X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=ad13d9410ae3ee9f3943c4a7c36780313d955a7c;hb=d64cf463dfcff15c05d49d4aa69d0bb5230294df;hp=7293cb75e0fea721c1ceff6f64037b5209b05c6a;hpb=3a6c6a2663a9647269e63106ffa3b9dc9a437027;p=unres.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7293cb7..ad13d94 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 0)
+set(UNRES_PATCH 2)
 set(UNRES_VERSION ${UNRES_MAJOR}.${UNRES_MINOR}.${UNRES_PATCH})
 
 #======================================
@@ -134,6 +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_NO5D "Choose the old code" OFF )
+option(UNRES_SUMSLD "Choose SUMSLD (ON) or LBFGS (OFF, default)" OFF )
 
 #=================================
 # MPI stuff
@@ -178,6 +181,7 @@ add_subdirectory(source/lib/xdrf)
 #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)
@@ -189,6 +193,16 @@ if(UNRES_WITH_MPI)
 #    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)
@@ -196,4 +210,5 @@ add_subdirectory(source/cluster/unres/src)
 #add_subdirectory(source/xdrfpdb/src)
 add_subdirectory(source/xdrfpdb/src-M)
 #add_subdirectory(source/maxlik/src_CSA)
-add_subdirectory(source/unres-dock)
+
+