[Cmake-commits] CMake branch, next, updated. v3.7.1-1840-g37debbd

[Domen Vrankar]

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  37debbdfda006617a0e83f171d617bb3bfdf44f2 (commit)
       via  803e1735e6bbd394e19e051ca81ee416c6921034 (commit)
      from  451fea216b47ccd5be8e699e1b08536f573e62b4 (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=37debbdfda006617a0e83f171d617bb3bfdf44f2
commit 37debbdfda006617a0e83f171d617bb3bfdf44f2
Merge: 451fea2 803e173
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Dec 23 15:10:22 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 23 15:10:22 2016 -0500

    Merge topic 'cpack-deb-md5sums-paths-fix' into next
    
    803e1735 fixup! confilct with another commit


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=803e1735e6bbd394e19e051ca81ee416c6921034
commit 803e1735e6bbd394e19e051ca81ee416c6921034
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Fri Dec 23 21:09:58 2016 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Fri Dec 23 21:09:58 2016 +0100

    fixup! confilct with another commit

diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake
index 96141e9..e104866 100644
--- a/Tests/RunCMake/CPack/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake
@@ -15,7 +15,6 @@ run_cpack_test(GENERATE_SHLIBS_LDCONFIG "DEB" true "COMPONENT")
 run_cpack_test(INSTALL_SCRIPTS "RPM" false "COMPONENT")
 run_cpack_test(LONG_FILENAMES "DEB" false "MONOLITHIC")
 run_cpack_test_subtests(MAIN_COMPONENT "invalid;found" "RPM" false "COMPONENT")
-run_cpack_test(MD5SUMS "DEB" false "MONOLITHIC;COMPONENT")
 run_cpack_test(MINIMAL "RPM;DEB;TGZ" false "MONOLITHIC")
 run_cpack_test_subtests(PACKAGE_CHECKSUM "invalid;MD5;SHA1;SHA224;SHA256;SHA384;SHA512" "TGZ" false "MONOLITHIC")
 run_cpack_test(PARTIALLY_RELOCATABLE_WARNING "RPM" false "COMPONENT")
@@ -24,3 +23,4 @@ run_cpack_test_subtests(SINGLE_DEBUGINFO "no_main_component;one_component;one_co
 run_cpack_source_test(SOURCE_PACKAGE "RPM")
 run_cpack_test(SUGGESTS "RPM" false "MONOLITHIC")
 run_cpack_test(USER_FILELIST "RPM" false "MONOLITHIC")
+run_cpack_test(MD5SUMS "DEB" false "MONOLITHIC;COMPONENT")

-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/CPack/RunCMakeTest.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake