Merge branch 'release-4-6' into release-5-0

Conflicts:
	CMakeLists.txt
Left CMake version condition in favour of new fix from release-4-6;
actual settings logic from release-5-0.

Change-Id: I493571b2aca74647a7547d5c2d9463679bdd858a

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15c9cff038ba199db077eab43cc1878825d1b090..4834e57380aee61d087fd55f1bbecf1c0cfa4412 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -805,7 +805,7 @@ include(gmxManageSuffixes)
 ################################################################
 # Shared library settings
 ################################################################
-if((NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") OR ((CMAKE_SYSTEM_VERSION VERSION_GREATER 8.0) AND (CMAKE_VERSION VERSION_GREATER 2.8.11)))
+if((NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin") OR ((CMAKE_SYSTEM_VERSION VERSION_GREATER 8.0) AND (NOT CMAKE_VERSION VERSION_LESS 2.8.12)))
     if(GMX_LIB_INSTALL_DIR STREQUAL "lib")
         set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
     endif()