From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Sat, 28 Jun 2014 18:59:54 +0000 (+0200)
Subject: Merge branch 'release-4-6' into release-5-0
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=04eef6613c1b48de0fbd36b114544f8c926051d3;p=alexxy%2Fgromacs.git

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
---

04eef6613c1b48de0fbd36b114544f8c926051d3
diff --cc CMakeLists.txt
index 15c9cff038,eba719f96d..4834e57380
--- a/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)