src-HCD-5D with no 5D

[unres.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e6bcf6..3681243 100644 (file)
--- 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})
 
 #======================================
@@ -135,6 +135,7 @@ option(UNRES_WITH_MPI "Choose whether or not to use MPI library" ON )
 
 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 )
 
 #=================================
 # MPI stuff
@@ -179,12 +180,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,7 +193,12 @@ if(UNRES_WITH_MPI)
 #    add_subdirectory(source/cluster/wham/src-M)
     add_subdirectory(source/cluster/wham/src-M-SAXS-homology)
 #
- endif(UNRES_5D)
+ 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)