X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Fwham%2Fsrc%2FCMakeLists.txt;h=9f3df871a0b9bb040263ef1ac9d480c984caa305;hb=011f9a16683bb48096837601ff7136a747e01981;hp=d30f3223c450e490775450ae1e12390f5ffd831d;hpb=cfa7a6aab4f44a7e42fe244652d00bcf08d8bd4e;p=unres.git

diff --git a/source/wham/src/CMakeLists.txt b/source/wham/src/CMakeLists.txt
index d30f322..9f3df87 100644
--- a/source/wham/src/CMakeLists.txt
+++ b/source/wham/src/CMakeLists.txt
@@ -94,7 +94,7 @@ set(UNRES_WHAM_PP_SRC
 # Set comipiler flags for different sourcefiles  
 #================================================
 if (Fortran_COMPILER_NAME STREQUAL "ifort")
-  set(FFLAGS0 "-mcmodel=medium -g -CB -I. -I${CMAKE_CURRENT_SOURCE_DIR}/include_unres" ) 
+  set(FFLAGS0 "-mcmodel=large -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 ()
@@ -106,7 +106,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} )
@@ -154,6 +154,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")
 
 #=========================================
@@ -177,7 +180,7 @@ set_property(SOURCE ${UNRES_WHAM_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS
 #========================================
 #  Setting binary name
 #========================================
-set(UNRES_WHAM_BIN "wham_${Fortran_COMPILER_NAME}.exe")
+set(UNRES_WHAM_BIN "wham_${Fortran_COMPILER_NAME}_${UNRES_MD_FF}.exe")
 
 #=========================================
 # cinfo.f workaround for CMake
@@ -221,19 +224,24 @@ set(UNRES_WHAM_SRCS ${UNRES_WHAM_SRC0} ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f proc_
 #=========================================
 add_executable(UNRES_WHAM_BIN ${UNRES_WHAM_SRCS} )
 set_target_properties(UNRES_WHAM_BIN PROPERTIES OUTPUT_NAME ${UNRES_WHAM_BIN})
-
-#set_property(TARGET ${UNRES_BIN} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/unres/MD )
+set_property(TARGET UNRES_WHAM_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_BIN ${MPIF_LIBRARIES} )
+# link MPI libraries
+target_link_libraries( UNRES_WHAM_BIN ${MPI_Fortran_LIBRARIES} )
 # link libxdrf.a 
 target_link_libraries( UNRES_WHAM_BIN xdrf )
 
 #=========================================
+# Install Path
+#=========================================
+install(TARGETS UNRES_WHAM_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/wham)
+
+
+#=========================================
 # TESTS 
 #=========================================