echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Swift: Support static-library try-compile type

Browse Source 
Top-level code only works as part of executables, which breaks when
`CMAKE_TRY_COMPILE_TARGET_TYPE` is set to `STATIC_LIBRARY`. This patch
fixes the test to something agnostic between executables and libraries
while still verifying that we can import types from the standard
library.

Fixes: #25984
This commit is contained in:
Evan Wilde 2024-05-13 15:37:20 -07:00
parent 40513f6a90
commit c6e52ef7f2
No known key found for this signature in database
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Modules/CMakeTestSwiftCompiler.cmake
View File

@ -24,7 +24,10 @@ if(NOT CMAKE_Swift_COMPILER_WORKS)
# Clear result from normal variable. # Clear result from normal variable.
unset(CMAKE_Swift_COMPILER_WORKS) unset(CMAKE_Swift_COMPILER_WORKS)
# Puts test result in cache variable. # Puts test result in cache variable.
set(__CMAKE_Swift_TEST_SOURCE "print(\"CMake\")\n") string(CONCAT __CMAKE_Swift_TEST_SOURCE
"public struct CMakeStruct {"
" let x: Int"
"}")
try_compile(CMAKE_Swift_COMPILER_WORKS try_compile(CMAKE_Swift_COMPILER_WORKS
SOURCE_FROM_VAR main.swift __CMAKE_Swift_TEST_SOURCE SOURCE_FROM_VAR main.swift __CMAKE_Swift_TEST_SOURCE
OUTPUT_VARIABLE __CMAKE_Swift_COMPILER_OUTPUT) OUTPUT_VARIABLE __CMAKE_Swift_COMPILER_OUTPUT)

1
Tests/RunCMake/Swift/EnableSwift.cmake Normal file
View File

@ -0,0 +1 @@
enable_language(Swift)

14
Tests/RunCMake/Swift/RunCMakeTest.cmake
View File

@ -69,6 +69,20 @@ elseif(RunCMake_GENERATOR STREQUAL Ninja)
run_cmake_command(CompileCommands-check ${CMAKE_COMMAND} --build .) run_cmake_command(CompileCommands-check ${CMAKE_COMMAND} --build .)
endblock() endblock()
block()
# Try enabling Swift with a static-library try-compile
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/StaticLibTryCompile-build)
set(RunCMake_TEST_OPTIONS -DCMAKE_TRY_COMPILE_TARGET_TYPE=STATIC_LIBRARY)
run_cmake(EnableSwift)
endblock()
block()
# Try enabling Swift with an executable try-compile
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ExecutableTryCompile-build)
set(RunCMake_TEST_OPTIONS -DCMAKE_TRY_COMPILE_TARGET_TYPE=EXECUTABLE)
run_cmake(EnableSwift)
endblock()
block() block()
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ForceResponseFile-build) set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ForceResponseFile-build)
run_cmake(ForceResponseFile) run_cmake(ForceResponseFile)