summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-07-10 14:07:34 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-07-10 14:07:39 (GMT)
commitd73ad4ed8b55cae3cd87bc06e7baefddce36944e (patch)
treeb841fb490adfed0fa4f1203368d0309f6b9410ba /Tests
parentc48129450864052160d061c6d7bd59f9044445a4 (diff)
parenteb2ee1dc7e82e7f89ccca024103bf64186a6d101 (diff)
downloadCMake-d73ad4ed8b55cae3cd87bc06e7baefddce36944e.zip
CMake-d73ad4ed8b55cae3cd87bc06e7baefddce36944e.tar.gz
CMake-d73ad4ed8b55cae3cd87bc06e7baefddce36944e.tar.bz2
Merge topic 'skip_mfc_test'
eb2ee1dc7e Tests: skip MFC test when building cmake when no file association for vcproj Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2196
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CMakeLists.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index b389a13..9200579 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1940,6 +1940,10 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
message(STATUS
".vcproj file association indicates VCExpress, avoiding MFC test")
set(CTEST_RUN_MFC OFF)
+ elseif( NOT ov )
+ message(STATUS
+ ".vcproj has no file association, avoiding MFC test")
+ set(CTEST_RUN_MFC OFF)
endif()
endif()