cmake: give openmm default suffixes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c869828c05176a067698b4f17cce883584f8b082..438e588a0ccfd9599fbffee29c05663af3246afc 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,6 +130,10 @@ if (GMX_DEFAULT_SUFFIX)
     set (GMX_BINARY_SUFFIX "${GMX_BINARY_SUFFIX}_d")
     set (GMX_LIBS_SUFFIX "${GMX_LIBS_SUFFIX}_d")
   endif(GMX_DOUBLE)
+  if (GMX_OPENMM)
+    set (GMX_BINARY_SUFFIX "-gpu")
+    set (GMX_LIBS_SUFFIX "_gpu")
+  endif(GMX_OPENMM)
   mark_as_advanced(FORCE GMX_BINARY_SUFFIX GMX_LIBS_SUFFIX)
   message(STATUS "Using default binary suffix: \"${GMX_BINARY_SUFFIX}\"")    
   message(STATUS "Using default library suffix: \"${GMX_LIBS_SUFFIX}\"") 

diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
index 91db5887702207efbf4e67ed79a105eb7475bf3f..e6f701c825715153c135d63e4f181d30d9c72988 100644 (file)
--- a/src/kernel/CMakeLists.txt
+++ b/src/kernel/CMakeLists.txt
@@ -100,13 +100,7 @@ set_target_properties(gmxcheck PROPERTIES OUTPUT_NAME "gmxcheck${GMX_BINARY_SUFF
 
 add_executable(mdrun ${MDRUN_SOURCES})
 target_link_libraries(mdrun ${GMX_EXTRA_LIBRARIES} ${GMX_OPENMM_LIBRARIES})
-# set binary name to mdrun-gpu
-if(GMX_OPENMM)
-    set(_mdrun_exec_name "mdrun-gpu")    
-else()
-    set(_mdrun_exec_name "mdrun${GMX_BINARY_SUFFIX}")
-endif()
-set_target_properties(mdrun PROPERTIES OUTPUT_NAME "${_mdrun_exec_name}")
+set_target_properties(mdrun PROPERTIES OUTPUT_NAME "mdrun${GMX_BINARY_SUFFIX}")
 
 # this is to circumvent the following MSVC error: 
 # warning LNK4098: defaultlib 'LIBCMT' conflicts with use of other libs