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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7293cb7..9e6bcf6 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 1)
 set(UNRES_VERSION ${UNRES_MAJOR}.${UNRES_MINOR}.${UNRES_PATCH})
 
 #======================================
@@ -134,6 +134,7 @@ 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 )
 
 #=================================
 # MPI stuff
@@ -178,6 +179,12 @@ 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)
 #    add_subdirectory(source/unres/src_MD-M)
 #    add_subdirectory(source/unres/src_MD_DFA)
 #    add_subdirectory(source/unres/src_CSA)
@@ -189,6 +196,11 @@ 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)
+#
+ endif(UNRES_5D)
+ 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 +208,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)
+
+