[Cmake-commits] CMake branch, next, updated. v3.6.2-2571-gce25447
Brad King
brad.king at kitware.com
Wed Sep 28 09:08:55 EDT 2016
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 ce2544721c6290f413a10bd382afb310da83bdd6 (commit)
via af35ddc80821d6fff54c5e9ede9dc24653f0253f (commit)
from b834963b30bdb36d4f401a581cbe79eaaac5a9ed (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=ce2544721c6290f413a10bd382afb310da83bdd6
commit ce2544721c6290f413a10bd382afb310da83bdd6
Merge: b834963 af35ddc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 28 09:08:54 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 28 09:08:54 2016 -0400
Merge topic 'cpack-rpm-test-source-newline' into next
af35ddc8 Tests: Add newline to RunCMake.CPack_RPM SOURCE_PACKAGE case
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af35ddc80821d6fff54c5e9ede9dc24653f0253f
commit af35ddc80821d6fff54c5e9ede9dc24653f0253f
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 28 09:07:42 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 28 09:07:42 2016 -0400
Tests: Add newline to RunCMake.CPack_RPM SOURCE_PACKAGE case
The `main.cpp` that this test generates needs a newline so that
compilers do not warn about a missing newline. Otherwise the warning
causes RunCMake infrastructure to detect unexpected output.
diff --git a/Tests/RunCMake/CPack/SOURCE_PACKAGE.cmake b/Tests/RunCMake/CPack/SOURCE_PACKAGE.cmake
index 9958c2a..946439d 100644
--- a/Tests/RunCMake/CPack/SOURCE_PACKAGE.cmake
+++ b/Tests/RunCMake/CPack/SOURCE_PACKAGE.cmake
@@ -1,5 +1,5 @@
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/main.cpp"
- "int main() {return 0;}")
+ "int main() {return 0;}\n")
add_executable(test_prog "${CMAKE_CURRENT_BINARY_DIR}/main.cpp")
install(TARGETS test_prog DESTINATION foo COMPONENT applications)
-----------------------------------------------------------------------
Summary of changes:
Tests/RunCMake/CPack/SOURCE_PACKAGE.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list