mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 16:32:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

cxxmodules: Honor CMAKE_CXX_SCAN_FOR_MODULES in try_compile

Browse Source 
Under CMP0155's NEW behavior, projects that explicitly enable C++20
support with `set(CMAKE_CXX_STANDARD 20)` may also explicitly
disable scanning with `set(CMAKE_CXX_SCAN_FOR_MODULES OFF)`.
We already propagate `CMAKE_CXX_STANDARD` into `try_compile` test
projects, so propagate `CMAKE_CXX_SCAN_FOR_MODULES` too.

Fixes: #25313
This commit is contained in:
Brad King
2023-10-10 11:14:50 -04:00
parent 308d687018
commit fd81024e80
4 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmCoreTryCompile.cxx
View File

@@ -72,6 +72,7 @@ SETUP_LANGUAGE(swift_properties, Swift);
std::string const kCMAKE_CUDA_ARCHITECTURES = "CMAKE_CUDA_ARCHITECTURES";
std::string const kCMAKE_CUDA_RUNTIME_LIBRARY = "CMAKE_CUDA_RUNTIME_LIBRARY";
std::string const kCMAKE_CXX_SCAN_FOR_MODULES = "CMAKE_CXX_SCAN_FOR_MODULES";
std::string const kCMAKE_ENABLE_EXPORTS = "CMAKE_ENABLE_EXPORTS";
std::string const kCMAKE_EXECUTABLE_ENABLE_EXPORTS =
"CMAKE_EXECUTABLE_ENABLE_EXPORTS";
@@ -1082,6 +1083,7 @@ cm::optional<cmTryCompileResult> cmCoreTryCompile::TryCompileCode(
&swift_properties[lang_property_start + lang_property_size]);
vars.insert(kCMAKE_CUDA_ARCHITECTURES);
vars.insert(kCMAKE_CUDA_RUNTIME_LIBRARY);
vars.insert(kCMAKE_CXX_SCAN_FOR_MODULES);
vars.insert(kCMAKE_ENABLE_EXPORTS);
vars.insert(kCMAKE_EXECUTABLE_ENABLE_EXPORTS);
vars.insert(kCMAKE_SHARED_LIBRARY_ENABLE_EXPORTS);

21
Tests/RunCMake/CXXModules/NoScanningVariable.cmake Normal file
View File

@@ -0,0 +1,21 @@
# Enable scanning by default for targets that explicitly use C++ 20.
cmake_policy(SET CMP0155 NEW)
enable_language(CXX)
# Hide any real scanning rule that may be available.
unset(CMAKE_CXX_SCANDEP_SOURCE)
# Explicitly enable C++20 for all targets.
set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
# Explicitly suppress scanning so that support is not required.
set(CMAKE_CXX_SCAN_FOR_MODULES OFF)
add_executable(noscanning-variable main-no-use.cxx)
# Verify that CMAKE_CXX_SCAN_FOR_MODULES is propagated into the check.
# FIXME: Unset CMAKE_CXX_SCANDEP_SOURCE inside try_compile so this
# test can verify behavior on newer compilers too.
try_compile(result SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/main-no-use.cxx)

1
Tests/RunCMake/CXXModules/RunCMakeTest.cmake
View File

@@ -20,6 +20,7 @@ if ("cxx_std_20" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
run_cmake(NoScanningSourceFileProperty)
run_cmake(NoScanningTargetProperty)
run_cmake(NoScanningVariable)
run_cmake(CMP0155-OLD)
run_cmake(CMP0155-NEW)
endif ()

4
Tests/RunCMake/CXXModules/main-no-use.cxx Normal file
View File

@@ -0,0 +1,4 @@
int main()
{
return 0;
}