diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ac589af702d805e0e39b818a5ecb1f96e76575b..633075c80c8eae47cc585d2b58e462386ab1e65b 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)