From d4aaaf16f8cd009cedaf460eced9ed9044f64eed Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Wed, 30 Sep 2015 14:51:45 +0200 Subject: [PATCH] Revert "Re-enable position independent code, but in a portable way." This reverts commit 2143dc97fa65c786c6566db1343ad270347dcfd3. --- CMakeLists.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 520bfb4f2..936b24433 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.9) +cmake_minimum_required(VERSION 2.8.8) if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR AND NOT MSVC_IDE) message(FATAL_ERROR "In-source builds are not allowed. @@ -375,12 +375,6 @@ set_property(TARGET osrm-prepare PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) set_property(TARGET osrm-datastore PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) set_property(TARGET osrm-routed PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE) -set_property(TARGET OSRM PROPERTY POSITION_INDEPENDENT_CODE ON) -set_property(TARGET osrm-extract PROPERTY POSITION_INDEPENDENT_CODE ON) -set_property(TARGET osrm-prepare PROPERTY POSITION_INDEPENDENT_CODE ON) -set_property(TARGET osrm-datastore PROPERTY POSITION_INDEPENDENT_CODE ON) -set_property(TARGET osrm-routed PROPERTY POSITION_INDEPENDENT_CODE ON) - install(FILES ${InstallGlob} DESTINATION include/osrm) install(FILES ${VariantGlob} DESTINATION include/variant) install(TARGETS osrm-extract DESTINATION bin)