X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=13cfec2e70d9db32ba178173349911cb7089dbb4;hb=7671844ec87e1dbaa9b6cb372934962bd66d3cd4;hp=699a92a3c2036854a487530d7a00e38c5d3bad76;hpb=46fe8741e820a8d8562ba6365832264a65755efd;p=unres.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 699a92a..13cfec2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,13 +116,13 @@ set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/bin" CACHE PATH "Binary install di
 
 # Set force field
 if (NOT UNRES_FF)
-  set(UNRES_MD_FF "GAB" CACHE STRING "Choose the force field, options are: GAB E0LL2Y" )
+  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")
 endif (NOT UNRES_FF)
 
 # Set CSA version force field
 if (NOT UNRES_CSA_FF)
-  set(UNRES_CSA_FF "4P" CACHE STRING "Choose the CSA version force field, options are: CASP3 ALPHA BETA ALPHABETA CASP5 3P 4P" )
+  set(UNRES_CSA_FF "E0LL2Y" CACHE STRING "Choose the CSA version force field, options are: CASP3 ALPHA BETA ALPHABETA CASP5 3P 4P" )
   set_property(CACHE UNRES_CSA_FF PROPERTY STRINGS "CASP3" "ALPHA" "BETA" "ALPHABETA" "CASP5" "3P" "4P" ) 
 endif (NOT UNRES_CSA_FF)
 
@@ -133,6 +133,7 @@ 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_DFA "Choose whether or not to use DFA" OFF )
 
 #=================================
 # MPI stuff
@@ -211,5 +212,6 @@ else()
   add_subdirectory(source/cluster/unres/src)
   add_subdirectory(source/xdrfpdb/src)
   add_subdirectory(source/xdrfpdb/src-M)
+  add_subdirectory(source/unres-dock)
 endif(UNRES_NA_MMCE)