Commit 02c52768 authored by David Moxey's avatar David Moxey

Fix macOS install name/rpath handling

parent 8154f6ce
...@@ -133,7 +133,6 @@ SET(NEKTAR_LIBRARY_TYPE "SHARED") ...@@ -133,7 +133,6 @@ SET(NEKTAR_LIBRARY_TYPE "SHARED")
# Set up RPATH # Set up RPATH
SET(CMAKE_SKIP_BUILD_RPATH FALSE) SET(CMAKE_SKIP_BUILD_RPATH FALSE)
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
SET(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}" "${TPLIB}")
LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
"${CMAKE_INSTALL_PREFIX}/${LIB_DIR}" isSystemDir) "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}" isSystemDir)
IF("${isSystemDir}" STREQUAL "-1") IF("${isSystemDir}" STREQUAL "-1")
...@@ -142,11 +141,10 @@ ELSE() ...@@ -142,11 +141,10 @@ ELSE()
SET(CMAKE_INSTALL_RPATH "${TPLIB}") SET(CMAKE_INSTALL_RPATH "${TPLIB}")
ENDIF() ENDIF()
# Get rid of OS X RPATH warnings -- we should set this to 1 once we reach # Enable the use of @rpath in macOS install names so that we can use multiple
# required minimum cmake version of 3.0.0 and configure it in a more sane # third-party directories.
# fashion.
IF(NOT DEFINED CMAKE_MACOSX_RPATH) IF(NOT DEFINED CMAKE_MACOSX_RPATH)
SET(CMAKE_MACOSX_RPATH 0) SET(CMAKE_MACOSX_RPATH 1)
ENDIF() ENDIF()
# Components of the Nektar++ package to build # Components of the Nektar++ package to build
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment