Fix/improve installation directory logic.

[alexxy/gromacs.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0888dd3c292aaa28364b80384840ed71cc486e49..5693688b246ccee0030b23b7f6c7aa79bbb8dd38 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1132,16 +1132,20 @@ endif(GMX_GPU)
 ########################################################################
 # Specify install locations
 ########################################################################
-if ( NOT DEFINED GMXLIB )
-    set(GMXLIB lib)
-endif()
-set(LIB_INSTALL_DIR "${GMX_INSTALL_PREFIX}${GMXLIB}")
+set(GMX_LIB_INSTALL_DIR lib CACHE STRING
+    "Library installation directory (default: lib)")
+set(GMX_DATA_INSTALL_DIR gromacs CACHE STRING
+    "Data installation directory under share/ (default: gromacs)")
+mark_as_advanced(GMX_LIB_INSTALL_DIR GMX_DATA_INSTALL_DIR)
+
+set(LIB_INSTALL_DIR  ${GMX_INSTALL_PREFIX}${GMX_LIB_INSTALL_DIR})
 set(BIN_INSTALL_DIR  ${GMX_INSTALL_PREFIX}bin)
-set(DATA_INSTALL_DIR ${GMX_INSTALL_PREFIX}share/gromacs)
+set(DATA_INSTALL_DIR ${GMX_INSTALL_PREFIX}share/${GMX_DATA_INSTALL_DIR})
 set(MAN_INSTALL_DIR  ${GMX_INSTALL_PREFIX}share/man)
 set(INCL_INSTALL_DIR ${GMX_INSTALL_PREFIX}include)
 
-set(GMXLIBDIR        ${DATA_INSTALL_DIR}/top)
+set(GMXLIB_SEARCH_DIR share/${GMX_DATA_INSTALL_DIR}/top)
+set(GMXLIB_FALLBACK   ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/top)
 
 ########################################################################
 # Set up binary and library suffixing