1) Threading cleanup in src_CSA & src_CSA_DiL

[unres.git] / source / cluster / wham / src / CMakeLists.txt

diff --git a/source/cluster/wham/src/CMakeLists.txt b/source/cluster/wham/src/CMakeLists.txt
index 0851e71..32f25a7 100644 (file)
--- a/source/cluster/wham/src/CMakeLists.txt
+++ b/source/cluster/wham/src/CMakeLists.txt
@@ -28,6 +28,7 @@ set(UNRES_CLUSTER_WHAM_SRC0
        noyes.f
        parmread.F
        pinorm.f
+       printmat.f
        probabl.F
        read_coords.F
        readpdb.f
@@ -35,6 +36,7 @@ set(UNRES_CLUSTER_WHAM_SRC0
        rescode.f
        setup_var.f
        srtclust.f
+       ssMD.F
        timing.F
        track.F
        wrtclust.f
@@ -50,6 +52,7 @@ set(UNRES_CLUSTER_WHAM_PP_SRC
        probabl.F
        read_coords.F
        readrtns.F
+       ssMD.F
        timing.F
        track.F
        work_partition.F
@@ -63,11 +66,15 @@ if (Fortran_COMPILER_NAME STREQUAL "ifort")
   set(FFLAGS0 "-ip -w -I. -I${CMAKE_CURRENT_SOURCE_DIR}/include_unres " ) 
 elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
   set(FFLAGS0 "-std=legacy -I. -I${CMAKE_CURRENT_SOURCE_DIR}/include_unres " ) 
+else ()
+  set(FFLAGS0 "-I. -I${CMAKE_CURRENT_SOURCE_DIR}/include_unres " ) 
 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_CLUSTER_WHAM_SRC0} PROPERTY COMPILE_FLAGS ${FFLAGS0} )
@@ -90,7 +97,7 @@ endif(UNRES_MD_FF STREQUAL "GAB")
 #=========================================
 # Additional flags
 #=========================================
-set(CPPFLAGS "${CPPFLAGS} -DUNRES -DISNAN" )
+set(CPPFLAGS "${CPPFLAGS} -DUNRES -DISNAN -DCLUST" )
 
 #=========================================
 # Compiler specific flags
@@ -169,9 +176,9 @@ set_target_properties(UNRES_CLUSTER_WHAM_BIN PROPERTIES OUTPUT_NAME ${UNRES_CLUS
 #=========================================
 # Link libraries
 #=========================================
-# link MPI library (libmpich.a)  
+# link MPI libraries
 if(UNRES_WITH_MPI)
-  target_link_libraries( UNRES_CLUSTER_WHAM_BIN ${MPIF_LIBRARIES} )
+  target_link_libraries( UNRES_CLUSTER_WHAM_BIN ${MPI_Fortran_LIBRARIES} )
 endif(UNRES_WITH_MPI)
 # link libxdrf.a 
 target_link_libraries( UNRES_CLUSTER_WHAM_BIN xdrf )