Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake: Make SourceControl a shared library #8124

Merged
merged 2 commits into from
Dec 13, 2024
Merged

CMake: Make SourceControl a shared library #8124

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e13169d
[cmake] Set up rpath for macOS binaries
Steelskin Nov 19, 2024
af4087c
Remove rpath modifications
Steelskin Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Sources/SourceControl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# See http://swift.org/LICENSE.txt for license information
# See http://swift.org/CONTRIBUTORS.txt for Swift project authors

add_library(SourceControl STATIC
add_library(SourceControl
GitRepository.swift
Repository.swift
RepositoryManager.swift)
Expand All @@ -20,3 +20,9 @@ target_link_libraries(SourceControl PUBLIC
# NOTE(compnerd) workaround for CMake not setting up include flags yet
set_target_properties(SourceControl PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_Swift_MODULE_DIRECTORY})

install(TARGETS SourceControl
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin)
set_property(GLOBAL APPEND PROPERTY SwiftPM_EXPORTS SourceControl)
3 changes: 3 additions & 0 deletions Sources/swift-build/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@ target_link_libraries(swift-build PRIVATE
target_compile_options(swift-build PRIVATE
-parse-as-library)

set_target_properties(swift-build PROPERTIES
INSTALL_RPATH "$<$<PLATFORM_ID:Darwin>:@executable_path/../lib;@executable_path/../lib/swift/macosx;@executable_path/../lib/swift/host;@executable_path/../lib/swift/pm/llbuild>")

install(TARGETS swift-build
DESTINATION bin)
3 changes: 3 additions & 0 deletions Sources/swift-experimental-sdk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@ target_link_libraries(swift-experimental-sdk PRIVATE
target_compile_options(swift-experimental-sdk PRIVATE
-parse-as-library)

set_target_properties(swift-experimental-sdk PROPERTIES
INSTALL_RPATH "$<$<PLATFORM_ID:Darwin>:@executable_path/../lib;@executable_path/../lib/swift/macosx;@executable_path/../lib/swift/host;@executable_path/../lib/swift/pm/llbuild>")

install(TARGETS swift-experimental-sdk
RUNTIME DESTINATION bin)
3 changes: 3 additions & 0 deletions Sources/swift-package/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,8 @@ target_link_libraries(swift-package PRIVATE
target_compile_options(swift-package PRIVATE
-parse-as-library)

set_target_properties(swift-package PROPERTIES
INSTALL_RPATH "$<$<PLATFORM_ID:Darwin>:@executable_path/../lib;@executable_path/../lib/swift/macosx;@executable_path/../lib/swift/host;@executable_path/../lib/swift/pm/llbuild>")

install(TARGETS swift-package
RUNTIME DESTINATION bin)
3 changes: 3 additions & 0 deletions Sources/swift-run/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@ target_link_libraries(swift-run PRIVATE
target_compile_options(swift-run PRIVATE
-parse-as-library)

set_target_properties(swift-run PROPERTIES
INSTALL_RPATH "$<$<PLATFORM_ID:Darwin>:@executable_path/../lib;@executable_path/../lib/swift/macosx;@executable_path/../lib/swift/host;@executable_path/../lib/swift/pm/llbuild>")

install(TARGETS swift-run
RUNTIME DESTINATION bin)
3 changes: 3 additions & 0 deletions Sources/swift-sdk/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@ target_link_libraries(swift-sdk PRIVATE
target_compile_options(swift-sdk PRIVATE
-parse-as-library)

set_target_properties(swift-sdk PROPERTIES
INSTALL_RPATH "$<$<PLATFORM_ID:Darwin>:@executable_path/../lib;@executable_path/../lib/swift/macosx;@executable_path/../lib/swift/host;@executable_path/../lib/swift/pm/llbuild>")

install(TARGETS swift-sdk
RUNTIME DESTINATION bin)
3 changes: 3 additions & 0 deletions Sources/swift-test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@ target_link_libraries(swift-test PRIVATE
target_compile_options(swift-test PRIVATE
-parse-as-library)

set_target_properties(swift-test PROPERTIES
INSTALL_RPATH "$<$<PLATFORM_ID:Darwin>:@executable_path/../lib;@executable_path/../lib/swift/macosx;@executable_path/../lib/swift/host;@executable_path/../lib/swift/pm/llbuild>")

install(TARGETS swift-test
RUNTIME DESTINATION bin)