diff options
| author | Brad King <brad.king@kitware.com> | 2021-05-04 15:20:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-05-04 15:20:39 (GMT) |
| commit | 7e31edee2282078491cdcf8abf275a40408a7fcc (patch) | |
| tree | 0720a6a512c3cf647f434c302fe0c00deffb793b /Tests/RunCMake | |
| parent | f060e6e556231fde7653d38679ec8d5608bdfc29 (diff) | |
| parent | bd16a985fcc26a2138e20ed11c248cd716eb5497 (diff) | |
| download | CMake-7e31edee2282078491cdcf8abf275a40408a7fcc.zip CMake-7e31edee2282078491cdcf8abf275a40408a7fcc.tar.gz CMake-7e31edee2282078491cdcf8abf275a40408a7fcc.tar.bz2 | |
Merge topic 'compile-features-lang-vars'
bd16a985fc CompilerId/Features: Tolerate variables named for languages
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Timothy Brackett <brackett.tc@gmail.com>
Merge-request: !6060
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/ToolchainFile/LangVars-toolchain.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/ToolchainFile/LangVars.cmake | 7 | ||||
| -rw-r--r-- | Tests/RunCMake/ToolchainFile/RunCMakeTest.cmake | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/Tests/RunCMake/ToolchainFile/LangVars-toolchain.cmake b/Tests/RunCMake/ToolchainFile/LangVars-toolchain.cmake new file mode 100644 index 0000000..be07dc3 --- /dev/null +++ b/Tests/RunCMake/ToolchainFile/LangVars-toolchain.cmake @@ -0,0 +1,2 @@ +set(C 1) +set(CXX 1) diff --git a/Tests/RunCMake/ToolchainFile/LangVars.cmake b/Tests/RunCMake/ToolchainFile/LangVars.cmake new file mode 100644 index 0000000..169e639 --- /dev/null +++ b/Tests/RunCMake/ToolchainFile/LangVars.cmake @@ -0,0 +1,7 @@ +foreach(test_language C CXX) + enable_language(${test_language}) + if(DEFINED CMAKE_${test_language}_STANDARD_DEFAULT + AND NOT CMAKE_${test_language}_COMPILE_FEATURES) + message(FATAL_ERROR "Compile features not found for ${test_language}") + endif() +endforeach() diff --git a/Tests/RunCMake/ToolchainFile/RunCMakeTest.cmake b/Tests/RunCMake/ToolchainFile/RunCMakeTest.cmake index 659523c..304c105 100644 --- a/Tests/RunCMake/ToolchainFile/RunCMakeTest.cmake +++ b/Tests/RunCMake/ToolchainFile/RunCMakeTest.cmake @@ -9,6 +9,7 @@ run_cmake_toolchain(CallEnableLanguage) run_cmake_toolchain(CallProject) run_cmake_toolchain(CheckLanguage) run_cmake_toolchain(FlagsInit) +run_cmake_toolchain(LangVars) run_cmake_toolchain(LinkFlagsInit) function(run_IncludeDirectories) |