From afd4ca73e706ef75c35a7023e3f9f81b1f45e519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Thu, 10 Dec 2015 11:13:26 +0100 Subject: [PATCH] CMake: enable MACOSX_RPATH by default. --- CMakeLists.txt | 5 +++++ package/ci/travis.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 09f32734f..8f125a949 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,11 @@ cmake_minimum_required(VERSION 2.8.9) project(Magnum) +# CMake policies: enable MACOSX_RPATH by default +if(POLICY CMP0042) + cmake_policy(SET CMP0042 NEW) +endif() + # Find Corrade first so we can check on the target set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/modules/") find_package(Corrade REQUIRED) diff --git a/package/ci/travis.yml b/package/ci/travis.yml index 9e83485cb..46534f32f 100644 --- a/package/ci/travis.yml +++ b/package/ci/travis.yml @@ -44,7 +44,7 @@ install: - cd corrade - mkdir build - cd build -- cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/deps -DCMAKE_INSTALL_RPATH=$HOME/deps/lib -DCMAKE_MACOSX_RPATH=ON -DCMAKE_BUILD_TYPE=Release +- cmake .. -DCMAKE_INSTALL_PREFIX=$HOME/deps -DCMAKE_INSTALL_RPATH=$HOME/deps/lib -DCMAKE_BUILD_TYPE=Release - cmake --build . - cmake --build . --target install - cd ..