summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2013-06-12 15:21:10 (GMT)
committerStephen Kelly <steveire@gmail.com>2013-06-12 15:21:10 (GMT)
commit6a6cda5b4a0fe561cc5f5b7d6ec12775d17a4457 (patch)
tree0d0041f2f55f02d6c8e9c24b3afe4088d37e33a4 /Tests
parent273ecab96d47d6ddba129be6200bc93ba7910b8c (diff)
downloadCMake-6a6cda5b4a0fe561cc5f5b7d6ec12775d17a4457.zip
CMake-6a6cda5b4a0fe561cc5f5b7d6ec12775d17a4457.tar.gz
CMake-6a6cda5b4a0fe561cc5f5b7d6ec12775d17a4457.tar.bz2
Don't run the WarnUnusedCliUnused test on Windows.
Even with the NMake Makefiles generator, it is not able to properly clean up after the test. http://open.cdash.org/testDetails.php?test=193424220&build=2934501 Internal cmake changing into directory: C:/Dashboards/My Tests/CMake-nmake10-x64-continuous/Tests/WarnUnusedCliUnused Error: cmake execution failed CMake Error: Error: generator : NMake Makefiles Does not match the generator used previously: Visual Studio 10 Either remove the CMakeCache.txt file or choose a different binary directory.
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index a91eac7..57b33ad 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1618,7 +1618,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
FAIL_REGULAR_EXPRESSION "CMake Warning .*VariableUnusedViaUnset.CMakeLists.txt:5 \\(set\\):")
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/WarnUnusedUnusedViaUnset")
- if("${CMAKE_TEST_GENERATOR}" MATCHES "Makefile")
+ if("${CMAKE_TEST_GENERATOR}" MATCHES "Makefile" AND NOT WIN32)
# Ninja does not support ADDITIONAL_MAKE_CLEAN_FILES and therefore fails
# this test. (See #13371)
# Apparently Visual Studio does not support it either. As the MakeClean