From 09eca2b5b312d64c378ae0b2e9c075b49fa1c68b Mon Sep 17 00:00:00 2001 From: kgv Date: Sun, 15 May 2016 16:41:30 +0300 Subject: [PATCH] 0027499: Configuration, CMake - add option INSTALL_NAME_DIR on OS X --- CMakeLists.txt | 4 ++++ adm/cmake/occt_toolkit.cmake | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc95958c49..3c2a6a0d23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -294,6 +294,10 @@ else() OCCT_INSTALL_FILE_OR_DIR ("OCCT_LGPL_EXCEPTION.txt" "${INSTALL_DIR}") endif() +if(APPLE) + set (INSTALL_NAME_DIR "" CACHE STRING "install_name library suffix on OS X (e.g. @executable_path/../Frameworks)") +endif() + # a directory recognized as a 'patch' for OCCT set (BUILD_PATCH "" CACHE PATH "${BUILD_PATCH_DESCR}") diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake index 6b33c45b38..85aaea3e50 100644 --- a/adm/cmake/occt_toolkit.cmake +++ b/adm/cmake/occt_toolkit.cmake @@ -176,6 +176,11 @@ endif() if (CURRENT_MODULE) set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER "Modules/${CURRENT_MODULE}") set_target_properties (${PROJECT_NAME} PROPERTIES MODULE "${CURRENT_MODULE}") + if (APPLE) + if (NOT "${INSTALL_NAME_DIR}" STREQUAL "") + set_target_properties (${PROJECT_NAME} PROPERTIES BUILD_WITH_INSTALL_RPATH 1 INSTALL_NAME_DIR "${INSTALL_NAME_DIR}") + endif() + endif() endif() get_property (OCC_VERSION_MAJOR GLOBAL PROPERTY OCC_VERSION_MAJOR) -- 2.20.1