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

diff --git a/source/wham/src/CMakeLists.txt b/source/wham/src/CMakeLists.txt
index e7f990e..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 ()
@@ -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
@@ -235,7 +238,7 @@ target_link_libraries( UNRES_WHAM_BIN xdrf )
 #=========================================
 # Install Path
 #=========================================
-install(TARGETS UNRES_WHAM_BIN DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS UNRES_WHAM_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/wham)
 
 
 #=========================================