[Cmake-commits] CMake branch, next, updated. v3.3.0-1982-g3350a96

[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  3350a96d57f0694be3cb0a305aad9ae82b75e790 (commit)
       via  c83c1680cf1ac9b5d01efc3bdf0a7c012326403f (commit)
      from  2ec5b3466da91b08b3f087f62625a4b6bf88208c (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3350a96d57f0694be3cb0a305aad9ae82b75e790
commit 3350a96d57f0694be3cb0a305aad9ae82b75e790
Merge: 2ec5b34 c83c168
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Aug 5 12:44:32 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 5 12:44:32 2015 -0400

    Merge topic 'cpack-rpm-documentation-fixes' into next
    
    c83c1680 RunCMake/CPack_DEB DEPENDENCIES test package content fix


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c83c1680cf1ac9b5d01efc3bdf0a7c012326403f
commit c83c1680cf1ac9b5d01efc3bdf0a7c012326403f
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Aug 5 18:44:00 2015 +0200
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Wed Aug 5 18:44:00 2015 +0200

    RunCMake/CPack_DEB DEPENDENCIES test package content fix
    
    On Mac shared libraries end with .dylib instead of .so so
    test should take this into account

diff --git a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
index 577a560..c56c670 100644
--- a/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
+++ b/Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake
@@ -8,6 +8,7 @@ set(EXPECTED_FILE_CONTENT_2 "^.*/usr/foo_auto${whitespaces_}.*/usr/foo_auto/test
 set(EXPECTED_FILE_3 "dependencies*-headers.deb")
 set(EXPECTED_FILE_CONTENT_3 "^.*/usr/bar${whitespaces_}.*/usr/bar/CMakeLists.txt$")
 set(EXPECTED_FILE_4 "dependencies*-libs.deb")
-set(EXPECTED_FILE_CONTENT_4 "^.*/usr/bas${whitespaces_}.*/usr/bas/libtest_lib.so$")
+# dynamic lib extension is .so on Linux and .dylib on Mac so we will use a wildcard .* for it
+set(EXPECTED_FILE_CONTENT_4 "^.*/usr/bas${whitespaces_}.*/usr/bas/libtest_lib\\..*$")
 set(EXPECTED_FILE_5 "dependencies*-libs_auto.deb")
-set(EXPECTED_FILE_CONTENT_5 "^.*/usr/bas_auto${whitespaces_}.*/usr/bas_auto/libtest_lib.so$")
+set(EXPECTED_FILE_CONTENT_5 "^.*/usr/bas_auto${whitespaces_}.*/usr/bas_auto/libtest_lib\\..*$")

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

Summary of changes:
 Tests/RunCMake/CPack/DEB/DEPENDENCIES-ExpectedFiles.cmake |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake