port lib suffixes to cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2940273c27ee5836a71038fa8adb0d4c18f5cdc1..34c1ea049bafe61dc9512b0fabe6e15c3ab8494c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,19 @@ option(GMX_X86_64_ASM "Add SSE assembly files for X86_64" OFF)
 
 option(USE_VERSION_H "Generate development version string/information" ON)
 
-set(GMX_BINARY_SUFFIX "" CACHE STRING "Suffix for GROMACS binaries.")
+option(GMX_DEFAULT_SUFFIX "Use default GROMACS suffixes" ON)
+set(GMX_BINARY_SUFFIX "" CACHE STRING "Suffix for GROMACS binaries (default: _d for doubule).")
+set(GMX_LIBS_SUFFIX "" 
+  CACHE STRING "Suffix for GROMACS libs (default: _d for double, _mpi for mpi, _mpi_d for mpi and double).")
+if (GMX_DEFAULT_SUFFIX)
+  if (GMX_MPI)
+    set(GMX_LIBS_SUFFIX "_mpi")
+  endif(GMX_MPI)
+  if (GMX_DOUBLE)
+    set (GMX_BINARY_SUFFIX "_d")
+    set (GMX_LIBS_SUFFIX "${GMX_LIBS_SUFFIX}_d")
+  endif(GMX_DOUBLE)
+endif(GMX_DEFAULT_SUFFIX)
 
 set(PKG_CFLAGS "")
 if(GMX_DOUBLE)

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 7b9d7b8845ad41da06b1023f5d170ecf9eac33be..5b87e81bb3ca85de3cf600940181c5c2392e0f3f 100644 (file)
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -3,10 +3,10 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GMXRC.bash.cmakein ${CMAKE_CURRENT_BI
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GMXRC.csh.cmakein  ${CMAKE_CURRENT_BINARY_DIR}/GMXRC.csh @ONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/GMXRC.zsh.cmakein  ${CMAKE_CURRENT_BINARY_DIR}/GMXRC.zsh @ONLY)
 
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/GMXRC DESTINATION ${BIN_INSTALL_DIR})
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/GMXRC.bash DESTINATION ${BIN_INSTALL_DIR})
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/GMXRC.zsh DESTINATION ${BIN_INSTALL_DIR})
-install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/GMXRC.csh DESTINATION ${BIN_INSTALL_DIR})
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/GMXRC      DESTINATION ${BIN_INSTALL_DIR} RENAME "GMXRC${GMX_BINARY_SUFFIX}")
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/GMXRC.bash DESTINATION ${BIN_INSTALL_DIR} RENAME "GMXRC${GMX_BINARY_SUFFIX}.bash")
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/GMXRC.zsh  DESTINATION ${BIN_INSTALL_DIR} RENAME "GMXRC${GMX_BINARY_SUFFIX}.zsh")
+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/GMXRC.csh  DESTINATION ${BIN_INSTALL_DIR} RENAME "GMXRC${GMX_BINARY_SUFFIX}.csh")
 
 file(GLOB EXTRA_SCRIPTS completion.* demux.pl xplor2gmx.pl)
 install(FILES ${EXTRA_SCRIPTS} DESTINATION ${BIN_INSTALL_DIR})

diff --git a/src/gmxlib/CMakeLists.txt b/src/gmxlib/CMakeLists.txt
index 78980877d106f2a03514bc95b1b5b9ab65c25cb9..b3da6933ee7eac66ae6b9d006b23c6262acdcb72 100644 (file)
--- a/src/gmxlib/CMakeLists.txt
+++ b/src/gmxlib/CMakeLists.txt
@@ -118,10 +118,10 @@ endif(GMX_ASM_USEASM-NASM)
 add_library(gmx ${GMXLIB_SOURCES} ${BLAS_SOURCES} ${LAPACK_SOURCES} ${GMX_SSEKERNEL_C_SRC} ${GMX_SSEKERNEL_ASM_SRC} ${THREAD_MPI_SRC})
 target_link_libraries(gmx ${GMX_EXTRA_LIBRARIES}  ${THREAD_LIB})
 add_dependencies(gmx gmx_version) 
-set_target_properties(gmx PROPERTIES OUTPUT_NAME "gmx${GMX_BINARY_SUFFIX}")
+set_target_properties(gmx PROPERTIES OUTPUT_NAME "gmx${GMX_LIBS_SUFFIX}")
 
 install(TARGETS gmx DESTINATION ${LIB_INSTALL_DIR})
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libgmx.pc.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libgmx.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgmx.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgmx.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig RENAME "libgmx${GMX_LIBS_SUFFIX}.pc")
 

diff --git a/src/kernel/CMakeLists.txt b/src/kernel/CMakeLists.txt
index 428e784d4d42d767036e657265a6e76e9f80fa5b..7234ef3d2034f671d41b5c96b4bc3b918454645e 100644 (file)
--- a/src/kernel/CMakeLists.txt
+++ b/src/kernel/CMakeLists.txt
@@ -39,8 +39,8 @@ set(MDRUN_SOURCES
 
 add_library(gmxpreprocess ${GMXPREPROCESS_SOURCES})
 target_link_libraries(gmxpreprocess md)
-set_target_properties(gmxpreprocess PROPERTIES OUTPUT_NAME "gmxpreprocess${GMX_BINARY_SUFFIX}")
-set_target_properties(md PROPERTIES OUTPUT_NAME "md${GMX_BINARY_SUFFIX}")
+set_target_properties(gmxpreprocess PROPERTIES OUTPUT_NAME "gmxpreprocess${GMX_LIBS_SUFFIX}")
+set_target_properties(md PROPERTIES OUTPUT_NAME "md${GMX_LIBS_SUFFIX}")
 
 if(GMX_OPENMM) 
     add_subdirectory(gmx_gpu_utils)
@@ -139,4 +139,5 @@ add_custom_target(install-mdrun
 endif(GMX_FAHCORE)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libgmxpreprocess.pc.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libgmxpreprocess.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgmxpreprocess.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgmxpreprocess.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig 
+  RENAME "libgmxpreprocess${GMX_LIBS_SUFFIX}.pc")

diff --git a/src/mdlib/CMakeLists.txt b/src/mdlib/CMakeLists.txt
index f1d4fa141f0a9340ad264841b13078357362fc95..dded8c875e4b96012243e7b58326e9ea5cdc3713 100644 (file)
--- a/src/mdlib/CMakeLists.txt
+++ b/src/mdlib/CMakeLists.txt
@@ -8,8 +8,9 @@ list(REMOVE_ITEM MDLIB_SOURCES ${NOT_MDLIB_SOURCES})
 
 add_library(md ${MDLIB_SOURCES})
 target_link_libraries(md gmx ${GMX_EXTRA_LIBRARIES} ${FFT_LIBRARIES} ${XML_LIBRARIES})
+set_target_properties(md PROPERTIES OUTPUT_NAME "md${GMX_LIBS_SUFFIX}")
 
 install(TARGETS md DESTINATION ${LIB_INSTALL_DIR})
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libmd.pc.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libmd.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmd.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libmd.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig RENAME "libmd${GMX_LIBS_SUFFIX}.pc")

diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 2c7b1f0069b12ceed37c11378d63ef0d7e2ceec0..0586b8507779b9ad88bd1931126d150bb3809ed8 100644 (file)
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -33,7 +33,7 @@ add_library(gmxana
 
 
 target_link_libraries(gmxana md gmx)
-set_target_properties(gmxana PROPERTIES OUTPUT_NAME "gmxana${GMX_BINARY_SUFFIX}")
+set_target_properties(gmxana PROPERTIES OUTPUT_NAME "gmxana${GMX_LIBS_SUFFIX}")
 
 # List of programs with single corresponding .c source file,
 # used to create build rules automatically.
@@ -68,4 +68,4 @@ install(TARGETS ${GMX_TOOLS_PROGRAMS}
        RUNTIME DESTINATION ${BIN_INSTALL_DIR})
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libgmxana.pc.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libgmxana.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgmxana.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libgmxana.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig RENAME "libgmxana${GMX_LIBS_SUFFIX}.pc")