summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-03-23 15:19:17 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-03-23 15:19:17 (GMT)
commit0235eac04b61cb7463459a2334c6167c08157105 (patch)
tree48727791d50f4f0e22776e5f51b5dd4568f265a6
parent38caf1bb7459d17339d06516eeb4e21787c14bd9 (diff)
parent4cdd6363879d8237add4ab73897d28dec2b3655c (diff)
downloadCMake-0235eac04b61cb7463459a2334c6167c08157105.zip
CMake-0235eac04b61cb7463459a2334c6167c08157105.tar.gz
CMake-0235eac04b61cb7463459a2334c6167c08157105.tar.bz2
Merge topic 'release-win64'
4cdd6363 Utilities/Release: Skip spurious Qt5Autogen test for nightly win64 binary
-rw-r--r--Utilities/Release/win64_release.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake
index cc1f37f..b2d4ad1 100644
--- a/Utilities/Release/win64_release.cmake
+++ b/Utilities/Release/win64_release.cmake
@@ -26,4 +26,8 @@ set(CXXFLAGS "${ppflags}")
set(ENV ". ~/rel/env64")
get_filename_component(path "${CMAKE_CURRENT_LIST_FILE}" PATH)
set(GIT_EXTRA "git config core.autocrlf true")
+if(CMAKE_CREATE_VERSION STREQUAL "nightly")
+ # Some tests fail spuriously too often.
+ set(EXTRA_CTEST_ARGS "-E Qt5Autogen")
+endif()
include(${path}/release_cmake.cmake)