Revert "Re-enable position independent code, but in a portable way."
This reverts commit 2143dc97fa65c786c6566db1343ad270347dcfd3.
This commit is contained in:
parent
119fb63576
commit
d4aaaf16f8
@ -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)
|
if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR AND NOT MSVC_IDE)
|
||||||
message(FATAL_ERROR "In-source builds are not allowed.
|
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-datastore PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||||
set_property(TARGET osrm-routed 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 ${InstallGlob} DESTINATION include/osrm)
|
||||||
install(FILES ${VariantGlob} DESTINATION include/variant)
|
install(FILES ${VariantGlob} DESTINATION include/variant)
|
||||||
install(TARGETS osrm-extract DESTINATION bin)
|
install(TARGETS osrm-extract DESTINATION bin)
|
||||||
|
Loading…
Reference in New Issue
Block a user