diff options
| author | Brad King <brad.king@kitware.com> | 2021-08-03 15:10:21 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-08-03 15:10:43 (GMT) |
| commit | affd8b09e68e0e64ab391f11a26e58ba439c39fb (patch) | |
| tree | 0ab346a64f87092ae8d6197555e3b30a577c2bcf /Tests/RunCMake | |
| parent | 792c2eac10e6ae7e5d2f84bb090a2565e8348416 (diff) | |
| parent | 22dab6eb96438b8563079c44d00c520df5b04a6e (diff) | |
| download | CMake-affd8b09e68e0e64ab391f11a26e58ba439c39fb.zip CMake-affd8b09e68e0e64ab391f11a26e58ba439c39fb.tar.gz CMake-affd8b09e68e0e64ab391f11a26e58ba439c39fb.tar.bz2 | |
Merge topic 'vs10-deprecate'
22dab6eb96 Deprecate Visual Studio 10 2010 generator
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6412
Diffstat (limited to 'Tests/RunCMake')
4 files changed, 12 insertions, 0 deletions
diff --git a/Tests/RunCMake/CommandLine/DeprecateVS10-WARN-OFF.cmake b/Tests/RunCMake/CommandLine/DeprecateVS10-WARN-OFF.cmake new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Tests/RunCMake/CommandLine/DeprecateVS10-WARN-OFF.cmake diff --git a/Tests/RunCMake/CommandLine/DeprecateVS10-WARN-ON-stderr.txt b/Tests/RunCMake/CommandLine/DeprecateVS10-WARN-ON-stderr.txt new file mode 100644 index 0000000..202ef80 --- /dev/null +++ b/Tests/RunCMake/CommandLine/DeprecateVS10-WARN-ON-stderr.txt @@ -0,0 +1,5 @@ +^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/DeprecateVS10-WARN-ON.cmake b/Tests/RunCMake/CommandLine/DeprecateVS10-WARN-ON.cmake new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Tests/RunCMake/CommandLine/DeprecateVS10-WARN-ON.cmake diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index 0b26b89..cea5b1b 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -918,3 +918,10 @@ 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() |