diff options
| author | Brad King <brad.king@kitware.com> | 2016-04-28 14:09:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-04-28 14:09:20 (GMT) |
| commit | ce82e0a53f4064693c14ce97a5efb3e38efc3fa7 (patch) | |
| tree | 247b2aa46caffa67183959851d77c009a36335f8 /Tests/RunCMake | |
| parent | 6a501b6519850c0dd2bcc687cd8da6fc6c9459d5 (diff) | |
| download | CMake-ce82e0a53f4064693c14ce97a5efb3e38efc3fa7.zip CMake-ce82e0a53f4064693c14ce97a5efb3e38efc3fa7.tar.gz CMake-ce82e0a53f4064693c14ce97a5efb3e38efc3fa7.tar.bz2 | |
Deprecate Visual Studio 7 .NET 2003 generator
Update documentation to mark the generator deprecated. Add a warning at
the end of generation plus an option to turn off the warning.
Diffstat (limited to 'Tests/RunCMake')
5 files changed, 15 insertions, 0 deletions
diff --git a/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-OFF.cmake b/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-OFF.cmake new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-OFF.cmake diff --git a/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-ON-stderr.txt b/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-ON-stderr.txt new file mode 100644 index 0000000..2cb01ff --- /dev/null +++ b/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-ON-stderr.txt @@ -0,0 +1,5 @@ +^CMake Warning: + The "Visual Studio 7 .NET 2003" generator is deprecated and will be removed + in a future version of CMake. + + Add CMAKE_WARN_VS71=OFF to the cache to disable this warning.$ diff --git a/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-ON.cmake b/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-ON.cmake new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/Tests/RunCMake/CommandLine/DeprecateVS71-WARN-ON.cmake diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index 7e26ce7..f449f1d 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -72,6 +72,13 @@ if(RunCMake_GENERATOR STREQUAL "Ninja") unset(RunCMake_TEST_NO_CLEAN) endif() +if(RunCMake_GENERATOR STREQUAL "Visual Studio 7 .NET 2003") + set(RunCMake_WARN_VS71 1) + run_cmake(DeprecateVS71-WARN-ON) + unset(RunCMake_WARN_VS71) + run_cmake(DeprecateVS71-WARN-OFF) +endif() + if(UNIX) run_cmake_command(E_create_symlink-no-arg ${CMAKE_COMMAND} -E create_symlink diff --git a/Tests/RunCMake/RunCMake.cmake b/Tests/RunCMake/RunCMake.cmake index 736faf1..fa0c980 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -51,6 +51,9 @@ function(run_cmake test) if(APPLE) list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0025=NEW) endif() + if(RunCMake_GENERATOR STREQUAL "Visual Studio 7 .NET 2003" AND NOT RunCMake_WARN_VS71) + list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_WARN_VS71=OFF) + endif() if(RunCMake_MAKE_PROGRAM) list(APPEND RunCMake_TEST_OPTIONS "-DCMAKE_MAKE_PROGRAM=${RunCMake_MAKE_PROGRAM}") endif() |