diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2022-11-28 16:36:14 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2022-12-01 16:42:46 (GMT) |
| commit | 388acfd46dd33d574c46ad640215f56fb576da66 (patch) | |
| tree | 79349298c2c8c6362171236702f3c7e0b590e9b5 /Tests | |
| parent | 069a32b03c812569a143e09e7025be76995495a6 (diff) | |
| download | CMake-388acfd46dd33d574c46ad640215f56fb576da66.zip CMake-388acfd46dd33d574c46ad640215f56fb576da66.tar.gz CMake-388acfd46dd33d574c46ad640215f56fb576da66.tar.bz2 | |
Tests/RunCMake/CXXModules: add support for Visual Studio
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/CXXModules/RunCMakeTest.cmake | 7 | ||||
| -rw-r--r-- | Tests/RunCMake/CXXModules/compiler_introspection.cmake | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake index b6eb340..01d59f8 100644 --- a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake +++ b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake @@ -43,6 +43,11 @@ if (RunCMake_GENERATOR MATCHES "Ninja" AND set(generator_supports_cxx_modules 1) endif () +if (RunCMake_GENERATOR MATCHES "Visual Studio" AND + CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.34") + set(generator_supports_cxx_modules 1) +endif () + # Test behavior when the generator does not support C++20 modules. if (NOT generator_supports_cxx_modules) if ("cxx_std_20" IN_LIST CMAKE_CXX_COMPILE_FEATURES) @@ -84,6 +89,8 @@ if (RunCMake_GENERATOR MATCHES "Ninja") run_cmake(NinjaDependInfoFileSet) run_cmake(NinjaDependInfoExport) run_cmake(NinjaDependInfoBMIInstall) +elseif (RunCMake_GENERATOR MATCHES "Visual Studio") + # Not supported yet. else () message(FATAL_ERROR "Please add 'DependInfo' tests for the '${RunCMake_GENERATOR}' generator.") diff --git a/Tests/RunCMake/CXXModules/compiler_introspection.cmake b/Tests/RunCMake/CXXModules/compiler_introspection.cmake index 7a2df3d..0e61383 100644 --- a/Tests/RunCMake/CXXModules/compiler_introspection.cmake +++ b/Tests/RunCMake/CXXModules/compiler_introspection.cmake @@ -20,6 +20,7 @@ string(APPEND info "\ set(CMAKE_CXX_COMPILE_FEATURES \"${CMAKE_CXX_COMPILE_FEATURES}\") set(CMAKE_MAKE_PROGRAM \"${CMAKE_MAKE_PROGRAM}\") set(forced_cxx_standard \"${forced_cxx_standard}\") +set(CMAKE_CXX_COMPILER_VERSION \"${CMAKE_CXX_COMPILER_VERSION}\") ") file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/info.cmake" "${info}") |