X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc%2FCMakeLists.txt;h=540872ae8b4a9cd6fce8da2079f6cb0274745953;hb=1d656a815651f26cc5ccb9ccf24d66cbbae2a048;hp=aeed5bc12910056823beee6415e32487b081e601;hpb=bf578f4ca518546ae36539a58425aba948a53d83;p=unres.git

diff --git a/source/wham/src/CMakeLists.txt b/source/wham/src/CMakeLists.txt
index aeed5bc..540872a 100644
--- a/source/wham/src/CMakeLists.txt
+++ b/source/wham/src/CMakeLists.txt
@@ -21,7 +21,7 @@ set(UNRES_WHAM_SRC0
 	arcos.f
 	cartder.f
 	cartprint.f
-	chainbuild.f
+	chainbuild.F
 	geomout.F
 	gnmr1.f
 	icant.f
@@ -37,11 +37,12 @@ set(UNRES_WHAM_SRC0
 	rescode.f
 	setup_var.f
 	slices.F
+	ssMD.F
 	store_parm.F
 	timing.F
 	wham_calc1.F
         readrtns_compar.F
-	readpdb.f
+	readpdb.F
 	fitsq.f 
 	contact.f
 	elecont.f
@@ -59,6 +60,7 @@ set(UNRES_WHAM_SRC0
 	proc_cont.f
 	define_pairs.f
 	mysort.f
+	dfa.F
 )
 
 set(UNRES_WHAM_PP_SRC
@@ -79,6 +81,7 @@ set(UNRES_WHAM_PP_SRC
 	readrtns_compar.F
 	readrtns.F
 	slices.F
+	ssMD.F
 	store_parm.F
 	timing.F
 	wham_calc1.F
@@ -95,6 +98,8 @@ if (Fortran_COMPILER_NAME STREQUAL "ifort")
   set(FFLAGS0 "-mcmodel=medium -g -CB -I. -I${CMAKE_CURRENT_SOURCE_DIR}/include_unres" ) 
 elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
   set(FFLAGS0 "-std=legacy -g -I. -I${CMAKE_CURRENT_SOURCE_DIR}/include_unres" ) 
+else ()
+  set(FFLAGS0 "-g -I. -I${CMAKE_CURRENT_SOURCE_DIR}/include_unres" )
 endif (Fortran_COMPILER_NAME STREQUAL "ifort")
 
 
@@ -102,7 +107,7 @@ endif (Fortran_COMPILER_NAME STREQUAL "ifort")
 # Add MPI compiler flags
 #=========================================
 if(UNRES_WITH_MPI)
-  set(FFLAGS0 "${FFLAGS0} -I${MPIF_INCLUDE_DIRECTORIES}")
+  set(FFLAGS0 "${FFLAGS0} -I${MPI_Fortran_INCLUDE_PATH}")
 endif(UNRES_WITH_MPI)
 
 set_property(SOURCE ${UNRES_WHAM_SRC0} PROPERTY COMPILE_FLAGS ${FFLAGS0} )
@@ -113,7 +118,7 @@ set_property(SOURCE ${UNRES_WHAM_SRC0} PROPERTY COMPILE_FLAGS ${FFLAGS0} )
 
 if(UNRES_MD_FF STREQUAL "GAB" )
   # set preprocesor flags   
-  set(CPPFLAGS "PROCOR  -DSPLITELE -DCRYST_BOND -DCRYST_THETA -DCRYST_SC  -DSCCORPDB" )
+  set(CPPFLAGS "PROCOR -DSPLITELE -DCRYST_BOND -DCRYST_THETA -DCRYST_SC  -DSCCORPDB" )
 
 #=========================================
 #  Settings for E0LL2Y force field
@@ -125,6 +130,12 @@ endif(UNRES_MD_FF STREQUAL "GAB")
 
 
 #=========================================
+# Additional flags
+#=========================================
+set(CPPFLAGS "${CPPFLAGS} -DUNRES -DISNAN -DWHAM ") 
+
+
+#=========================================
 # System specific flags
 #=========================================
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")