Skip to content

CMake 4.0.1 fixes #22

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 2 commits into from
May 5, 2025
Merged

CMake 4.0.1 fixes #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15a0102
CMake4.0 Fixes: Only pass sdk to swift when set
etcwilde Apr 19, 2025
18ed217
Add CMake 4.0.1 to test set
etcwilde May 4, 2025
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
2 changes: 2 additions & 0 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ jobs:
hash: 2dd48ccd3e3d872ee4cc916f3f4e24812612421007e895f82bf9fc7e49831d62
- version: 3.30.8
hash: adc81f2944e6f86b44e86acea3abea1651ed7890206933484b8b74ac1280314f
- version: 4.0.1
hash: d66c11c010588c8256ee20a26b45977cd5b2f4aee2b742d4b8a353769940d147
steps:
- name: Clone Repo
uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions 3_bidirectional_cxx_interop/cmake/modules/AddSwift.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ function(_swift_generate_cxx_header target header)
list(TRANSFORM ARG_SEARCH_PATHS PREPEND "-I")
endif()

if(APPLE)
if(APPLE AND CMAKE_OSX_SYSROOT)
set(SDK_FLAGS "-sdk" "${CMAKE_OSX_SYSROOT}")
elseif(WIN32)
set(SDK_FLAGS "-sdk" "$ENV{SDKROOT}")
elseif(DEFINED ${CMAKE_SYSROOT})
elseif(CMAKE_SYSROOT)
set(SDK_FLAGS "-sdk" "${CMAKE_SYSROOT}")
endif()

Expand All @@ -54,7 +54,7 @@ function(_swift_generate_cxx_header target header)
DEPENDS ${_SwiftSources}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMAND
${CMAKE_Swift_COMPILER} -frontend -typecheck
${CMAKE_Swift_COMPILER} -typecheck
${ARG_SEARCH_PATHS}
${_SwiftSources}
${SDK_FLAGS}
Expand Down
2 changes: 1 addition & 1 deletion 3_bidirectional_cxx_interop/cmake/modules/InitializeSwift.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ endfunction()
function(_setup_swift_paths)
# If we haven't set the swift library search paths, do that now
if(NOT SWIFT_LIBRARY_SEARCH_PATHS)
if(APPLE)
if(CMAKE_OSX_SYSROOT)
set(SDK_FLAGS "-sdk" "${CMAKE_OSX_SYSROOT}")
endif()

Expand Down