From b465415cff7529c08e10ddf196320eaefe1af43f Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Mon, 2 Mar 2020 13:44:23 -0600 Subject: Follow PDAL's CMake RPATH strategy --- CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca241df3..4faf679e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,6 +37,13 @@ set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_C_EXTENSIONS OFF) message(STATUS "Requiring C${CMAKE_C_STANDARD} - done") +SET(CMAKE_SKIP_BUILD_RPATH FALSE) +SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +IF (APPLE) + SET(MACOSX_RPATH ON) +endif() + # Set global -fvisibility=hidden set(CMAKE_C_VISIBILITY_PRESET hidden) set(CMAKE_CXX_VISIBILITY_PRESET hidden) -- cgit v1.2.3 From 6f71d3f7d10f2596d8df520771143837a6d0b247 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Tue, 3 Mar 2020 08:22:17 -0600 Subject: cmakelint changes as requested --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4faf679e..18a90b44 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,11 +37,11 @@ set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_C_EXTENSIONS OFF) message(STATUS "Requiring C${CMAKE_C_STANDARD} - done") -SET(CMAKE_SKIP_BUILD_RPATH FALSE) -SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) -SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -IF (APPLE) - SET(MACOSX_RPATH ON) +set(CMAKE_SKIP_BUILD_RPATH FALSE) +set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) +set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +if(APPLE) + set(MACOSX_RPATH ON) endif() # Set global -fvisibility=hidden -- cgit v1.2.3