diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-09 14:42:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-09 14:42:18 (GMT) |
| commit | b42866a34a742f89a35382d17d58070c73486d92 (patch) | |
| tree | 5728aef86df7ff0d6a677875b442d12147da2e46 /Tests/BuildDepends | |
| parent | cd9ba3ec453d547b15ab761e20793a1a17bbbd8d (diff) | |
| download | CMake-b42866a34a742f89a35382d17d58070c73486d92.zip CMake-b42866a34a742f89a35382d17d58070c73486d92.tar.gz CMake-b42866a34a742f89a35382d17d58070c73486d92.tar.bz2 | |
Drop Visual Studio 6 generator
This generator has been deprecated since CMake 3.3. Remove it.
Update documentation, modules, and tests to drop content specific
to this generator.
Diffstat (limited to 'Tests/BuildDepends')
| -rw-r--r-- | Tests/BuildDepends/CMakeLists.txt | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/Tests/BuildDepends/CMakeLists.txt b/Tests/BuildDepends/CMakeLists.txt index 36987de..9b48b14 100644 --- a/Tests/BuildDepends/CMakeLists.txt +++ b/Tests/BuildDepends/CMakeLists.txt @@ -42,7 +42,7 @@ list(APPEND _cmake_options "-DTEST_LINK_DEPENDS=${TEST_LINK_DEPENDS}") list(APPEND _cmake_options "-DCMAKE_FORCE_DEPFILES=1") -if(NOT CMAKE_GENERATOR MATCHES "Visual Studio ([^6789]|[6789][0-9])") +if(NOT CMAKE_GENERATOR MATCHES "Visual Studio ([^789]|[789][0-9])") set(TEST_MULTI3 1) list(APPEND _cmake_options "-DTEST_MULTI3=1") endif() @@ -304,9 +304,6 @@ message("Run result: ${runResult} Output: \"${out}\"") if("${out}" STREQUAL "HEADER_STRING: ninja changed ") message("Worked!") -elseif(CMAKE_GENERATOR STREQUAL "Visual Studio 6") - # Tolerate failure because VS 6 does not seem to recompile ninjadep.cpp - # when the "dir/header.h" it includes changes. else() message(SEND_ERROR "Project did not rebuild properly. Output[${out}]\n" " expected [HEADER_STRING: ninja changed]") |