src-HCD-5D with no 5D

[unres.git] / source / cluster / wham / src-HCD-5D / CMakeLists.txt

diff --git a/source/cluster/wham/src-HCD-5D/CMakeLists.txt b/source/cluster/wham/src-HCD-5D/CMakeLists.txt
index 736f403..d443628 100644 (file)
--- a/source/cluster/wham/src-HCD-5D/CMakeLists.txt
+++ b/source/cluster/wham/src-HCD-5D/CMakeLists.txt
@@ -123,7 +123,7 @@ elseif(UNRES_MD_FF STREQUAL "E0LL2Y")
 elseif(UNRES_MD_FF STREQUAL "4P")
   set(CPPFLAGS "SPLITELE -DLANG0 -DCRYST_BOND -DCRYST_THETA -DCRYST_SC -DSCCORPDB -DFOURBODY" )
 elseif(UNRES_MD_FF STREQUAL "NEWCORR")
-  set(CPPFLAGS "PROCOR  -DSPLITELE -DCORRCD -DNEWCORR -DFIVEDIAG" )
+  set(CPPFLAGS "PROCOR  -DSPLITELE -DCORRCD -DNEWCORR" )
 endif(UNRES_MD_FF STREQUAL "GAB")
 
 #=========================================
@@ -135,6 +135,10 @@ if(UNRES_DFA)
  set(CPPFLAGS "${CPPFLAGS} -DDFA")
 endif(UNRES_DFA)
 
+if(UNRES_5D)
+ set(CPPFLAGS "${CPPFLAGS} -DFIVEDIAG" )
+endif()
+
 #=========================================
 # Compiler specific flags
 #=========================================
@@ -179,11 +183,16 @@ set_property(SOURCE proc_proc.c PROPERTY COMPILE_DEFINITIONS "LINUX -DPGI" )
 #========================================
 #  Setting binary name
 #========================================
+
+set(DFA "")
+set(HCD-5D "")
 if(UNRES_DFA)
- set(UNRES_CLUSTER_WHAM_M_BIN "cluster_wham-mult_${Fortran_COMPILER_NAME}_MPI_${UNRES_MD_FF}_HCD-5D_DFA.exe")
-else(UNRES_DFA)
- set(UNRES_CLUSTER_WHAM_M_BIN "cluster_wham-mult_${Fortran_COMPILER_NAME}_MPI_${UNRES_MD_FF}_HCD-5D.exe")
-endif(UNRES_DFA)
+ set(DFA "_DFA")
+endif()
+if(UNRES_5D)
+ set(HCD-5D "_HCD-5D")
+endif()
+set(UNRES_CLUSTER_WHAM_M_BIN "cluster_wham-mult_${Fortran_COMPILER_NAME}_MPI_${UNRES_MD_FF}${HCD-5D}${DFA}.exe")
 
 #=========================================
 # cinfo.f workaround for CMake