Skip to content

Commit a2bcb77

Browse files
committed
build: use more global properties
Specify RPATH and POSITION_INDEPENDENT globally rather than on a per-target basis.
1 parent d862f0c commit a2bcb77

File tree

3 files changed

+5
-11
lines changed

3 files changed

+5
-11
lines changed

CMakeLists.txt

+5
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,11 @@ set(CMAKE_C_VISIBILITY_INLINES_HIDDEN YES)
9191
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
9292
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
9393

94+
set(CMAKE_POSITION_INDEPENDENT_CODE YES)
95+
if(NOT APPLE)
96+
set(CMAKE_INSTALL_RPATH "$ORIGIN")
97+
endif()
98+
9499
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
95100
set(THREADS_PREFER_PTHREAD_FLAG TRUE)
96101
if(ANDROID)

src/CMakeLists.txt

-8
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,6 @@ if(HAVE_OBJC)
8888
swift/DispatchStubs.cc)
8989
endif()
9090

91-
92-
set_target_properties(dispatch PROPERTIES
93-
POSITION_INDEPENDENT_CODE YES)
94-
9591
target_include_directories(dispatch PUBLIC
9692
${PROJECT_BINARY_DIR}
9793
${PROJECT_SOURCE_DIR}
@@ -171,10 +167,6 @@ if(APPLE)
171167
"-Xlinker -alias_list -Xlinker ${PROJECT_SOURCE_DIR}/xcodeconfig/libdispatch.aliases")
172168
endif()
173169

174-
if(NOT APPLE)
175-
set_target_properties(dispatch PROPERTIES INSTALL_RPATH "$ORIGIN")
176-
endif()
177-
178170
if(LINKER_SUPPORTS_BUILD_ID)
179171
target_link_options(dispatch PRIVATE "LINKER:--build-id=sha1")
180172
endif()

src/swift/CMakeLists.txt

-3
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ if(HAVE_OBJC)
33
DispatchStubs.cc)
44
target_include_directories(DispatchStubs PRIVATE
55
${PROJECT_SOURCE_DIR})
6-
set_target_properties(DispatchStubs PROPERTIES
7-
POSITION_INDEPENDENT_CODE YES)
86
endif()
97

108
add_library(swiftDispatch
@@ -35,7 +33,6 @@ target_link_libraries(swiftDispatch PUBLIC
3533
dispatch)
3634
if(NOT DARWIN AND NOT WIN32)
3735
target_link_options(swiftDispatch PRIVATE "SHELL:-no-toolchain-stdlib-rpath")
38-
set_target_properties(swiftDispatch PROPERTIES INSTALL_RPATH "$ORIGIN")
3936
endif()
4037

4138
set_property(GLOBAL APPEND PROPERTY DISPATCH_EXPORTS swiftDispatch)

0 commit comments

Comments
 (0)