Skip to content

[CMake] Updates to allow inclusion using FetchContent #2173

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

Merged
merged 8 commits into from
Sep 28, 2023
Merged

[CMake] Updates to allow inclusion using FetchContent #2173

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
87d268f
[CMake] Updates to allow inclusion using FetchContent
bnbarham May 16, 2023
19b95e6
[CMake] Use 'SWIFT_HOST_TRIPLE' to set '-target'
rintaro Aug 31, 2023
05e4a10
[CMake] Remove unnecessary padding from RUNPATH in Linux
rintaro Aug 31, 2023
a47c358
[CMake] Set provided RPATH
rintaro Sep 6, 2023
1b30b77
[CMake] Add back 'SwiftSyntaxConfig.cmake' exported targets
rintaro Sep 13, 2023
b369ac0
[CMake] Use CMAKE_*_OUTPUT_DIRECTORY variables instead of custom vars
rintaro Sep 20, 2023
bcd7fc4
[CMake] Improve target_link_swift_syntax_libraries
rintaro Sep 21, 2023
1b410c9
[CMake] swift should set 'CMAKE_Swift_COMPILER_TARGET' correctly
rintaro Sep 21, 2023
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
Prev Previous commit
[CMake] swift should set 'CMAKE_Swift_COMPILER_TARGET' correctly 
So don't use 'SWIFT_HOST_TRIPLE'
  • Loading branch information
@rintaro
rintaro committed Sep 21, 2023
commit 1b410c931ee80abc0e833309c08de9997a90aa9c
6 changes: 0 additions & 6 deletions cmake/modules/AddSwiftHostLibrary.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,6 @@ function(add_swift_syntax_library name)
$<$<COMPILE_LANGUAGE:Swift>:-wmo>)
endif()

if(SWIFT_HOST_TRIPLE)
target_compile_options("${name}" PRIVATE
$<$<COMPILE_LANGUAGE:Swift>:-target;${SWIFT_HOST_TRIPLE};>
)
endif()

if(LLVM_USE_LINKER)
target_link_options(${name} PRIVATE
"-use-ld=${LLVM_USE_LINKER}"
Expand Down