[Cmake-commits] CMake branch, next, updated. v3.4.0-rc1-86-g3d6c305
Brad King
brad.king at kitware.com
Tue Oct 6 13:59:29 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 3d6c305c4e458276e6ebadfe88a3ca2a88c7e010 (commit)
via b520b1ca4ec3d51a031d44a25080931c5bb73b83 (commit)
via 26a0b52dfe94bad42e1f249aa0341dd1fbbc38cc (commit)
from 5636a8971908bd663f148081401cf48725bcf71c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3d6c305c4e458276e6ebadfe88a3ca2a88c7e010
commit 3d6c305c4e458276e6ebadfe88a3ca2a88c7e010
Merge: 5636a89 b520b1c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 13:59:28 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 13:59:28 2015 -0400
Merge topic 'release-nightly-linux64' into next
b520b1ca Tests: Add a nightly Linux 64-bit binary
26a0b52d Tests: Rename Linux nightly release binary test to Linux32
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b520b1ca4ec3d51a031d44a25080931c5bb73b83
commit b520b1ca4ec3d51a031d44a25080931c5bb73b83
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 13:58:45 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 13:58:45 2015 -0400
Tests: Add a nightly Linux 64-bit binary
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 2b23360..3f28c25 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -691,6 +691,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
dashmacmini5_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32
magrathea_release.cmake)
+ ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux64
+ linux64_release.cmake)
endif()
# add tests with more complex invocations
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26a0b52dfe94bad42e1f249aa0341dd1fbbc38cc
commit 26a0b52dfe94bad42e1f249aa0341dd1fbbc38cc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 13:56:19 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 13:56:19 2015 -0400
Tests: Rename Linux nightly release binary test to Linux32
Distinguish the name from a future 64-bit nightly binary.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1861d82..2b23360 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -689,7 +689,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
dash2win64_release.cmake)
ADD_NIGHTLY_BUILD_TEST(CMakeNightlyOSX
dashmacmini5_release.cmake)
- ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux
+ ADD_NIGHTLY_BUILD_TEST(CMakeNightlyLinux32
magrathea_release.cmake)
endif()
-----------------------------------------------------------------------
Summary of changes:
Tests/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list