From 506d812e71c0ad4d0ea4fbb7344eccf85ef517d5 Mon Sep 17 00:00:00 2001
From: Justin Carpentier <justin.carpentier@inria.fr>
Date: Wed, 16 Oct 2019 17:13:18 +0200
Subject: [PATCH] cmake: use default policy for APPLE systems
---
CMakeLists.txt | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ac589af..633075c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,21 +24,12 @@ PROJECT(${PROJECT_NAME} CXX)
INCLUDE(cmake/boost.cmake)
INCLUDE(cmake/python.cmake)
INCLUDE(cmake/ide.cmake)
+INCLUDE(cmake/apple.cmake)
STRING(REPLACE "-pedantic" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-IF(APPLE)
- SET(CMAKE_MACOSX_RPATH TRUE)
- SET(CMAKE_SKIP_BUILD_RPATH FALSE)
- SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
- #SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
- LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
- IF("${isSystemDir}" STREQUAL "-1")
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
- ENDIF("${isSystemDir}" STREQUAL "-1")
-ENDIF(APPLE)
+# If needed, fix CMake policy for APPLE systems
+APPLY_DEFAULT_APPLE_CONFIGURATION()
IF(WIN32)
SET(LINK copy_if_different)
--
GitLab