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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cde6acd..ad13d94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,8 +6,8 @@ cmake_minimum_required(VERSION 2.8)
 project(UNRESPACK Fortran C)
 
 set(UNRES_MAJOR 3)
-set(UNRES_MINOR 2)
-set(UNRES_PATCH 1)
+set(UNRES_MINOR 5)
+set(UNRES_PATCH 2)
 set(UNRES_VERSION ${UNRES_MAJOR}.${UNRES_MINOR}.${UNRES_PATCH})
 
 #======================================
@@ -28,7 +28,7 @@ MACRO (TODAY RESULT)
     ENDIF (WIN32)
 ENDMACRO (TODAY)
 
-# foramt variables used in cinfo.f 
+# format variables used in cinfo.f 
 MACRO (CINFO_FORMAT FN VN VD)
 # 50 znakowi
 # 73 w ca?ej linii
@@ -116,8 +116,8 @@ set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/bin" CACHE PATH "Binary install di
 
 # Set force field
 if (NOT UNRES_FF)
-  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")
+  set(UNRES_MD_FF "NEWCORR" CACHE STRING "Choose the force field, options are: GAB E0LL2Y NEWCORR" )
+  set_property(CACHE UNRES_MD_FF PROPERTY STRINGS "GAB" "E0LL2Y" "NEWCORR")
 endif (NOT UNRES_FF)
 
 # Set CSA version force field
@@ -131,9 +131,12 @@ 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_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,9 +181,11 @@ 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)
+#    add_subdirectory(source/unres/src_CSA)
+    add_subdirectory(source/unres/src_MD-M-SAXS-homology)
 #    add_subdirectory(source/unres/src_CSA_DiL)
 #    add_subdirectory(source/wham/src)
 #    add_subdirectory(source/wham/src-M)
@@ -188,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)
@@ -195,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)
+
+