diff options
| author | Brad King <brad.king@kitware.com> | 2023-10-04 19:48:36 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-10-05 17:17:00 (GMT) |
| commit | b8ead378def8dc03dcae6b65f956c26c585eba3e (patch) | |
| tree | e4658121d42f5b6079059b590a5f72449f0d08d7 /Tests | |
| parent | 68fca3eafeaf244c37843f186bd4af8a314df08c (diff) | |
| download | CMake-b8ead378def8dc03dcae6b65f956c26c585eba3e.zip CMake-b8ead378def8dc03dcae6b65f956c26c585eba3e.tar.gz CMake-b8ead378def8dc03dcae6b65f956c26c585eba3e.tar.bz2 | |
cxxmodules: Scan only targets that explicitly enable C++ 20
Previously we scanned any targets for which C++ 20 is enabled,
even if enabled only by the compiler's default, such as when
`CXXFLAGS=-std=c++20`.
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CXXModules/ImplicitCXX20.cmake | 13 | ||||
| -rw-r--r-- | Tests/RunCMake/CXXModules/Inspect.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CXXModules/RunCMakeTest.cmake | 3 |
3 files changed, 18 insertions, 0 deletions
diff --git a/Tests/RunCMake/CXXModules/ImplicitCXX20.cmake b/Tests/RunCMake/CXXModules/ImplicitCXX20.cmake new file mode 100644 index 0000000..cac1777 --- /dev/null +++ b/Tests/RunCMake/CXXModules/ImplicitCXX20.cmake @@ -0,0 +1,13 @@ +# Enable scanning by default for targets that explicitly use C++ 20. +cmake_policy(SET CMP0155 NEW) + +# Force CMAKE_CXX_STANDARD_DEFAULT to be C++ 20. +set(ENV{CXXFLAGS} "$ENV{CXXFLAGS} ${CMAKE_CXX20_STANDARD_COMPILE_OPTION}") +enable_language(CXX) + +# Hide any real scanning rule that may be available. +unset(CMAKE_CXX_SCANDEP_SOURCE) + +# Create a target that does not explicitly use C++ 20 to verify it works +# without any scanning rule available. +add_executable(cmp0155-new sources/module-use.cxx) diff --git a/Tests/RunCMake/CXXModules/Inspect.cmake b/Tests/RunCMake/CXXModules/Inspect.cmake index 8c74940..612b01b 100644 --- a/Tests/RunCMake/CXXModules/Inspect.cmake +++ b/Tests/RunCMake/CXXModules/Inspect.cmake @@ -23,6 +23,8 @@ set(forced_cxx_standard \"${forced_cxx_standard}\") set(CMAKE_CXX_COMPILER_VERSION \"${CMAKE_CXX_COMPILER_VERSION}\") set(CMAKE_CXX_OUTPUT_EXTENSION \"${CMAKE_CXX_OUTPUT_EXTENSION}\") set(CXXModules_default_build_type \"${CMAKE_BUILD_TYPE}\") +set(CMAKE_CXX_STANDARD_DEFAULT \"${CMAKE_CXX_STANDARD_DEFAULT}\") +set(CMAKE_CXX20_STANDARD_COMPILE_OPTION \"${CMAKE_CXX20_STANDARD_COMPILE_OPTION}\") ") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/info.cmake" "${info}") diff --git a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake index dd18d20..05d2655 100644 --- a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake +++ b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake @@ -13,6 +13,9 @@ if ("cxx_std_20" IN_LIST CMAKE_CXX_COMPILE_FEATURES) # standard. If the compiler forces a standard to be used, skip it. if (NOT forced_cxx_standard) run_cmake(NoCXX20) + if(CMAKE_CXX_STANDARD_DEFAULT AND CMAKE_CXX20_STANDARD_COMPILE_OPTION) + run_cmake_with_options(ImplicitCXX20 -DCMAKE_CXX20_STANDARD_COMPILE_OPTION=${CMAKE_CXX20_STANDARD_COMPILE_OPTION}) + endif() endif () run_cmake(NoScanningSourceFileProperty) |