diff options
| author | Brad King <brad.king@kitware.com> | 2022-09-27 14:32:03 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-09-27 14:32:11 (GMT) |
| commit | 164a156c7c26aaf4f30e73ae0cdb6d2e8a10e0a4 (patch) | |
| tree | 80ff163cf9ef18f863398d159996e7050923e06d /Tests/RunCMake | |
| parent | 2992d4057aea12d88c9cb44b2e001f70ead9eb90 (diff) | |
| parent | 8d6f015d59262c53cda4394defaba9b4ae1278dd (diff) | |
| download | CMake-164a156c7c26aaf4f30e73ae0cdb6d2e8a10e0a4.zip CMake-164a156c7c26aaf4f30e73ae0cdb6d2e8a10e0a4.tar.gz CMake-164a156c7c26aaf4f30e73ae0cdb6d2e8a10e0a4.tar.bz2 | |
Merge topic 'remove-vs10-generator'
8d6f015d59 Drop Visual Studio 10 2010 generator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7718
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/BuildDepends/RunCMakeTest.cmake | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/DeprecateVS10-WARN-ON-stderr.txt | 5 | ||||
| -rw-r--r-- | Tests/RunCMake/CommandLine/RunCMakeTest.cmake | 7 |
3 files changed, 1 insertions, 14 deletions
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake index 06f416b..8099079 100644 --- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake +++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake @@ -60,8 +60,7 @@ set(run_BuildDepends_skip_step_3 1) run_BuildDepends(C-Exe) if(NOT RunCMake_GENERATOR STREQUAL "Xcode") - if(RunCMake_GENERATOR MATCHES "Visual Studio 10" OR - RunCMake_GENERATOR_TOOLSET MATCHES "^(v80|v90|v100)$") + if(RunCMake_GENERATOR_TOOLSET MATCHES "^(v80|v90|v100)$") # VS 10 forgets to re-link when a manifest changes set(run_BuildDepends_skip_step_2 1) endif() diff --git a/Tests/RunCMake/CommandLine/DeprecateVS10-WARN-ON-stderr.txt b/Tests/RunCMake/CommandLine/DeprecateVS10-WARN-ON-stderr.txt deleted file mode 100644 index 202ef80..0000000 --- a/Tests/RunCMake/CommandLine/DeprecateVS10-WARN-ON-stderr.txt +++ /dev/null @@ -1,5 +0,0 @@ -^CMake Warning: - The "Visual Studio 10 2010" generator is deprecated and will be removed in - a future version of CMake. - - Add CMAKE_WARN_VS10=OFF to the cache to disable this warning.$ diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index 1b5a1d6..dc61759 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -1071,10 +1071,3 @@ set(ProfilingTestOutput ${RunCMake_TEST_BINARY_DIR}/output.json) set(RunCMake_TEST_OPTIONS --profiling-format=google-trace --profiling-output=${ProfilingTestOutput}) run_cmake(ProfilingTest) unset(RunCMake_TEST_OPTIONS) - -if(RunCMake_GENERATOR MATCHES "^Visual Studio 10 2010") - run_cmake_with_options(DeprecateVS10-WARN-ON -DCMAKE_WARN_VS10=ON) - unset(ENV{CMAKE_WARN_VS10}) - run_cmake(DeprecateVS10-WARN-ON) - run_cmake_with_options(DeprecateVS10-WARN-OFF -DCMAKE_WARN_VS10=OFF) -endif() |