diff options
| author | Brad King <brad.king@kitware.com> | 2016-04-28 14:03:07 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-04-28 14:04:09 (GMT) |
| commit | 6a501b6519850c0dd2bcc687cd8da6fc6c9459d5 (patch) | |
| tree | 0ba5ceb7f0bf38d2f5082239bb04ab2741b95cea | |
| parent | 5b4f771fd7eb02f4bb5248194796d191347e492b (diff) | |
| download | CMake-6a501b6519850c0dd2bcc687cd8da6fc6c9459d5.zip CMake-6a501b6519850c0dd2bcc687cd8da6fc6c9459d5.tar.gz CMake-6a501b6519850c0dd2bcc687cd8da6fc6c9459d5.tar.bz2 | |
Tests: Drop test for VS 7.0 generator deprecation warnings
We removed this generator but forgot to remove this now-unused test
case.
5 files changed, 0 insertions, 15 deletions
diff --git a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-OFF.cmake b/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-OFF.cmake deleted file mode 100644 index e69de29..0000000 --- a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-OFF.cmake +++ /dev/null diff --git a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt b/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt deleted file mode 100644 index ea31ef3..0000000 --- a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON-stderr.txt +++ /dev/null @@ -1,5 +0,0 @@ -^CMake Warning: - The "Visual Studio 7" generator is deprecated and will be removed in a - future version of CMake. - - Add CMAKE_WARN_VS70=OFF to the cache to disable this warning.$ diff --git a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON.cmake b/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON.cmake deleted file mode 100644 index e69de29..0000000 --- a/Tests/RunCMake/CommandLine/DeprecateVS70-WARN-ON.cmake +++ /dev/null diff --git a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake index 3b5504e..7e26ce7 100644 --- a/Tests/RunCMake/CommandLine/RunCMakeTest.cmake +++ b/Tests/RunCMake/CommandLine/RunCMakeTest.cmake @@ -72,13 +72,6 @@ if(RunCMake_GENERATOR STREQUAL "Ninja") unset(RunCMake_TEST_NO_CLEAN) endif() -if(RunCMake_GENERATOR STREQUAL "Visual Studio 7") - set(RunCMake_WARN_VS70 1) - run_cmake(DeprecateVS70-WARN-ON) - unset(RunCMake_WARN_VS70) - run_cmake(DeprecateVS70-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 9d44a8a..736faf1 100644 --- a/Tests/RunCMake/RunCMake.cmake +++ b/Tests/RunCMake/RunCMake.cmake @@ -51,9 +51,6 @@ function(run_cmake test) if(APPLE) list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0025=NEW) endif() - if(RunCMake_GENERATOR STREQUAL "Visual Studio 7" AND NOT RunCMake_WARN_VS70) - list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_WARN_VS70=OFF) - endif() if(RunCMake_MAKE_PROGRAM) list(APPEND RunCMake_TEST_OPTIONS "-DCMAKE_MAKE_PROGRAM=${RunCMake_MAKE_PROGRAM}") endif() |