summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-12-06 20:15:42 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-12-06 20:15:59 (GMT)
commit60ebe5f3da67151f79e068f193ff309f7a358d41 (patch)
tree6510704a1b0cf57616e7516a51469bfba49739b4
parent67cbfed81981a25aa56a3d05a267c1acf6ea5781 (diff)
parent69419c58709e8a89dbb893295ac09c5f75cd25f3 (diff)
downloadCMake-60ebe5f3da67151f79e068f193ff309f7a358d41.zip
CMake-60ebe5f3da67151f79e068f193ff309f7a358d41.tar.gz
CMake-60ebe5f3da67151f79e068f193ff309f7a358d41.tar.bz2
Merge topic 'ci-vs-managed' into release-3.22
69419c5870 ci: Enable more VS tests that use managed code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6782
-rw-r--r--Tests/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 36bbc62..8b38080 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2234,7 +2234,7 @@ if(BUILD_TESTING)
endif()
if(NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio 9 "
- AND NOT CMAKE_GENERATOR_TOOLSET)
+ AND NOT CMAKE_GENERATOR_TOOLSET STREQUAL "v90")
ADD_TEST_MACRO(VSWindowsFormsResx VSWindowsFormsResx)
ADD_TEST_MACRO(VSManagedCustomCommand)
endif()