Fixed binary/lib suffixing inconsistencies (bug 539)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d316f569a06e79b8b470e767a7e21b2dcc21f60f..a5e4d28965d90149645d7a9aa86e43054e366370 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -112,20 +112,27 @@ option(USE_VERSION_H "Generate development version string/information" ON)
 mark_as_advanced(USE_VERSION_H)
 
 option(GMX_DEFAULT_SUFFIX "Use default GROMACS suffixes" ON)
-set(GMX_BINARY_SUFFIX "" CACHE STRING "Suffix for GROMACS binaries (default: _d for double).")
+set(GMX_BINARY_SUFFIX "" CACHE STRING "Suffix for GROMACS binaries (default: _d for double, _mpi for mpi, _mpi_d for mpi and double).")
 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)
+  set(GMX_BINARY_SUFFIX "")
+  set(GMX_LIBS_SUFFIX "")
   if (GMX_MPI)
+    set(GMX_BINARY_SUFFIX "_mpi")
     set(GMX_LIBS_SUFFIX "_mpi")
   endif(GMX_MPI)
   if (GMX_DOUBLE)
-    set (GMX_BINARY_SUFFIX "_d")
+    set (GMX_BINARY_SUFFIX "${GMX_BINARY_SUFFIX}_d")
     set (GMX_LIBS_SUFFIX "${GMX_LIBS_SUFFIX}_d")
   endif(GMX_DOUBLE)
   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}\"") 
 else(GMX_DEFAULT_SUFFIX)
-   mark_as_advanced(CLEAR GMX_BINARY_SUFFIX GMX_LIBS_SUFFIX)
+  mark_as_advanced(CLEAR GMX_BINARY_SUFFIX GMX_LIBS_SUFFIX)
+  message(STATUS "Using manually set binary suffix: \"${GMX_BINARY_SUFFIX}\"")    
+  message(STATUS "Using manually set library suffix: \"${GMX_LIBS_SUFFIX}\"")
 endif(GMX_DEFAULT_SUFFIX)
 
 set(PKG_CFLAGS "")