From 876f54694aa2ec98eb17e2d0d96a59e55f0d0ad9 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Wed, 5 Aug 2015 17:57:22 +0200 Subject: [PATCH] Revert "fixed cmake policy CMP0042, MACOSX RPATH" --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21fc18f97..66f32e4d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,10 @@ cmake_policy(SET CMP0015 NEW) +# this policy was introduced in cmake 3.0 +# remove if, once 3.0 will be used on unix +if (${CMAKE_MAJOR_VERSION} GREATER 2) + # old policy do not use MACOSX_RPATH + cmake_policy(SET CMP0042 OLD) +endif() set(CMAKE_AUTOMOC OFF) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB")