diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-18 13:43:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-03-18 13:43:23 (GMT) |
| commit | 9cdb37e9175b2e3c6367bc4863fda0404cb1c3a2 (patch) | |
| tree | 3f9a50fdc4fbd93b27a1de1ed4e6a030722b32ce /Tests | |
| parent | 1bcdc4db1bcfc75cf9813bc279840b975e74892d (diff) | |
| parent | c089485d2131c7074c931b99044b8d00d498f414 (diff) | |
| download | CMake-9cdb37e9175b2e3c6367bc4863fda0404cb1c3a2.zip CMake-9cdb37e9175b2e3c6367bc4863fda0404cb1c3a2.tar.gz CMake-9cdb37e9175b2e3c6367bc4863fda0404cb1c3a2.tar.bz2 | |
Merge topic 'release-win64'
c089485d Utilities/Release: Skip spurious Qt5Autogen test for nightly binary
e903a9fc Utilities/Release: Create a Windows 64-bit binary
dd630075 Utilities/Release: Rename scripts to match target platform
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 76ea5b4..8a256bf 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -684,14 +684,17 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release endif() endmacro() if(CMAKE_BUILD_NIGHTLY_RELEASES) - ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWindows - dash3win7_release.cmake) + ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin32 + win32_release.cmake) + ADD_NIGHTLY_BUILD_TEST(CMakeNightlyWin64 + win64_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX - bigmac_release.cmake) + osx_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32 - magrathea_release.cmake) + linux32_release.cmake) ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64 linux64_release.cmake) + set_property(TEST CMakeNightlyWin64 PROPERTY DEPENDS CMakeNightlyWin32) endif() # add tests with more complex invocations |