diff options
| author | Brad King <brad.king@kitware.com> | 2018-04-02 14:09:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-04-02 14:09:15 (GMT) |
| commit | e42fcb117fa1a8d063023bb39db96da93159ee40 (patch) | |
| tree | 14d7bebbe0c817626d3db9131575c955a7e0eecd /Tests/RunCMake/CMakeLists.txt | |
| parent | a76e23eabbd21ff4af54755362bead6334b279b7 (diff) | |
| parent | eb80af90936a17863d974f0a4257c9b6da62ec84 (diff) | |
| download | CMake-e42fcb117fa1a8d063023bb39db96da93159ee40.zip CMake-e42fcb117fa1a8d063023bb39db96da93159ee40.tar.gz CMake-e42fcb117fa1a8d063023bb39db96da93159ee40.tar.bz2 | |
Merge topic 'remove-vs8-generator'
eb80af9093 Drop Visual Studio 8 2005 generator
e7af91d026 Tests: Remove unused file from Tutorial Step7 test
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1901
Diffstat (limited to 'Tests/RunCMake/CMakeLists.txt')
| -rw-r--r-- | Tests/RunCMake/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index ce80c13..ff4a80e 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -306,13 +306,13 @@ endif() if("${CMAKE_GENERATOR}" MATCHES "Visual Studio") add_RunCMake_test(include_external_msproject) - if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([89]|10)" AND NOT CMAKE_VS_DEVENV_COMMAND) + if("${CMAKE_GENERATOR}" MATCHES "Visual Studio (9|10)" AND NOT CMAKE_VS_DEVENV_COMMAND) set(NO_USE_FOLDERS 1) endif() add_RunCMake_test(VSSolution -DNO_USE_FOLDERS=${NO_USE_FOLDERS}) endif() -if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([^89]|[89][0-9])") +if("${CMAKE_GENERATOR}" MATCHES "Visual Studio ([^9]|9[0-9])") add_RunCMake_test(VS10Project) endif() @@ -434,6 +434,6 @@ if(CMake_TEST_ANDROID_NDK OR CMake_TEST_ANDROID_STANDALONE_TOOLCHAIN) set_property(TEST RunCMake.Android PROPERTY TIMEOUT ${CMake_TEST_ANDROID_TIMEOUT}) endif() -if(${CMAKE_GENERATOR} MATCHES "Visual Studio ([^89]|[89][0-9])") +if(${CMAKE_GENERATOR} MATCHES "Visual Studio ([^9]|9[0-9])") add_RunCMake_test(CSharpCustomCommand) endif() |