mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-25 09:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'swift-win32-property'

Browse Source 
c782f140d4 Swift: Ignore WIN32_EXECUTABLE property outside of Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6658
This commit is contained in:
Brad King
2021-10-29 12:53:13 +00:00
committed by Kitware Robot
parent 71833ee6b5 c782f140d4
commit 0486f9e56e
4 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmGlobalGenerator.cxx
+6
View File
@@ -337,6 +337,12 @@ bool cmGlobalGenerator::CheckTargetsForType() const
bool failed = false;
for (const auto& generator : this->LocalGenerators) {
for (const auto& target : generator->GetGeneratorTargets()) {
std::string systemName =
target->Makefile->GetSafeDefinition("CMAKE_SYSTEM_NAME");
if (systemName.find("Windows") == std::string::npos) {
continue;
}
if (target->GetType() == cmStateEnums::EXECUTABLE) {
std::vector<std::string> const& configs =
target->Makefile->GetGeneratorConfigs(
Tests/RunCMake/CMakeLists.txt
+1 -1
View File
@@ -345,7 +345,7 @@ if(UNIX AND CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG AND CMAKE_EXECUTABLE_FORMAT STRE
add_RunCMake_test(RuntimePath)
endif()
add_RunCMake_test(ScriptMode)
add_RunCMake_test(Swift -DCMAKE_Swift_COMPILER=${CMAKE_Swift_COMPILER})
add_RunCMake_test(Swift -DCMAKE_Swift_COMPILER=${CMAKE_Swift_COMPILER} -DCMAKE_SYSTEM_NAME=${CMAKE_SYSTEM_NAME})
add_RunCMake_test(TargetObjects)
add_RunCMake_test(TargetProperties)
add_RunCMake_test(ToolchainFile)
Tests/RunCMake/Swift/RunCMakeTest.cmake
+8 -5
View File
@@ -6,11 +6,14 @@ if(RunCMake_GENERATOR STREQUAL Xcode)
endif()
elseif(RunCMake_GENERATOR STREQUAL Ninja)
if(CMAKE_Swift_COMPILER)
run_cmake(Win32ExecutableDisallowed)
set(RunCMake_TEST_OPTIONS -DCMAKE_SYSTEM_NAME=Darwin)
run_cmake(SwiftMultiArch)
unset(RunCMake_TEST_OPTIONS)
if (CMAKE_SYSTEM_NAME MATCHES "Windows")
run_cmake_with_options(Win32ExecutableDisallowed)
else()
run_cmake_with_options(Win32ExecutableIgnored)
set(RunCMake_TEST_OPTIONS -DCMAKE_SYSTEM_NAME=Darwin)
run_cmake(SwiftMultiArch)
unset(RunCMake_TEST_OPTIONS)
endif()
endif()
elseif(RunCMake_GENERATOR STREQUAL "Ninja Multi-Config")
if(CMAKE_Swift_COMPILER)
Tests/RunCMake/Swift/Win32ExecutableIgnored.cmake
+4
View File
@@ -0,0 +1,4 @@
enable_language(Swift)
add_executable(E E.swift)
set_target_properties(E PROPERTIES
WIN32_EXECUTABLE TRUE)