X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc-M%2FCMakeLists.txt;h=678a85ff5afb01eb7c12a38396a60e3cf52aea62;hb=d6044e422fadc338f33bb4111e4f18f00f7c7a37;hp=e99035cea4dba7d41d988c1e9c5df6fb3e7b391b;hpb=cfa7a6aab4f44a7e42fe244652d00bcf08d8bd4e;p=unres.git

diff --git a/source/wham/src-M/CMakeLists.txt b/source/wham/src-M/CMakeLists.txt
index e99035c..678a85f 100644
--- a/source/wham/src-M/CMakeLists.txt
+++ b/source/wham/src-M/CMakeLists.txt
@@ -61,6 +61,7 @@ set(UNRES_WHAM_M_SRC0
 	proc_cont.f
 	define_pairs.f
 	mysort.f
+        ssMD.F
 )
 
 set(UNRES_WHAM_M_PP_SRC
@@ -108,7 +109,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_M_SRC0} PROPERTY COMPILE_FLAGS ${FFLAGS0} )
@@ -120,6 +121,7 @@ if(UNRES_MD_FF STREQUAL "GAB" )
   # set preprocesor flags   
   set(CPPFLAGS "PROCOR  -DSPLITELE -DCRYST_BOND -DCRYST_THETA -DCRYST_SC  -DSCCORPDB" )
 
+
 #=========================================
 #  Settings for E0LL2Y force field
 #=========================================
@@ -153,6 +155,9 @@ elseif (Fortran_COMPILER_NAME STREQUAL "f95")
 elseif (Fortran_COMPILER_NAME STREQUAL "gfortran")
   # Add old gfortran flags
   set(CPPFLAGS "${CPPFLAGS} -DG77") 
+else (Fortran_COMPILER_NAME STREQUAL "ifort")
+  # Default preprocessor flags
+  set(CPPFLAGS "${CPPFLAGS} -DPGI")
 endif (Fortran_COMPILER_NAME STREQUAL "ifort")
 
 #=========================================
@@ -176,7 +181,7 @@ set_property(SOURCE ${UNRES_WHAM_M_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLA
 #========================================
 #  Setting binary name
 #========================================
-set(UNRES_WHAM_M_BIN "wham_${Fortran_COMPILER_NAME}.exe")
+set(UNRES_WHAM_M_BIN "wham_M_${Fortran_COMPILER_NAME}_${UNRES_MD_FF}.exe")
 
 #=========================================
 # cinfo.f workaround for CMake
@@ -220,18 +225,24 @@ set(UNRES_WHAM_M_SRCS ${UNRES_WHAM_M_SRC0} ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f p
 #=========================================
 add_executable(UNRES_WHAM_M_BIN ${UNRES_WHAM_M_SRCS} )
 set_target_properties(UNRES_WHAM_M_BIN PROPERTIES OUTPUT_NAME ${UNRES_WHAM_M_BIN})
-
-#set_property(TARGET ${UNRES_BIN} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/unres/MD )
+set_property(TARGET UNRES_WHAM_M_BIN PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 #add_dependencies (${UNRES_BIN} ${UNRES_XDRFLIB})
 
 #=========================================
 # Link libraries
 #=========================================
 # link MPI library (libmpich.a)  
-target_link_libraries( UNRES_WHAM_M_BIN ${MPIF_LIBRARIES} )
+target_link_libraries( UNRES_WHAM_M_BIN ${MPI_Fortran_LIBRARIES} )
 # link libxdrf.a 
 target_link_libraries( UNRES_WHAM_M_BIN xdrf )
 
+
+#=========================================
+# Install Path
+#=========================================
+install(TARGETS UNRES_WHAM_M_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/wham)
+
+
 #=========================================
 # TESTS 
 #=========================================