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 --cc CMakeLists.txt
index 15c9cff038ba199db077eab43cc1878825d1b090,eba719f96d68e92806affc1bc447e7abe9377a21..4834e57380aee61d087fd55f1bbecf1c0cfa4412
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -805,14 -1198,13 +805,14 @@@ 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)))
 -    set(CMAKE_SKIP_BUILD_RPATH  FALSE)
 -    set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 +    if(GMX_LIB_INSTALL_DIR STREQUAL "lib")
 +        set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
 +    endif()
      if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
 -        set(CMAKE_INSTALL_RPATH "\\\$ORIGIN/../${GMXLIB}")
 +        set(CMAKE_INSTALL_RPATH "\$ORIGIN/../${GMX_LIB_INSTALL_DIR}")
      else()
 -        set(CMAKE_INSTALL_RPATH "@executable_path/../${GMXLIB}")
 +        set(CMAKE_INSTALL_RPATH "@executable_path/../${GMX_LIB_INSTALL_DIR}")
      endif()
      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
      set(CMAKE_MACOSX_RPATH 1)