diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f10da336..cb21a37de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,7 @@ if(${CMAKE_VERSION} VERSION_GREATER "3.4") CMAKE_MINIMUM_REQUIRED (VERSION 3.5) else() CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12) + CMAKE_POLICY(SET CMP0042 NEW) IF ((CMAKE_VERSION VERSION_GREATER 3.1) OR (CMAKE_VERSION VERSION_EQUAL 3.1)) CMAKE_POLICY(SET CMP0054 NEW) @@ -52,18 +53,6 @@ CONFIGURE_FILE ( @ONLY ) -IF (APPLE) - SET(CMAKE_MACOSX_RPATH ON) - SET(CMAKE_SKIP_BUILD_RPATH FALSE) - SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) - SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") - SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - 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 () -ENDIF () - IF (MSGPACK_32BIT) IF ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") SET (CMAKE_C_FLAGS "-m32 ${CMAKE_C_FLAGS}")