[Cmake-commits] CMake branch, next, updated. v3.5.0-rc3-206-g35e1746

[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  35e17466e259b1692860454746029cad86a705de (commit)
       via  b8263a2f8d6df42b2a37c2efc2f7a3ac2b1d658a (commit)
      from  12c3852f2b18f582ffd713d93998253cdd5dc8de (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=35e17466e259b1692860454746029cad86a705de
commit 35e17466e259b1692860454746029cad86a705de
Merge: 12c3852 b8263a2
Author:     Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Thu Feb 18 19:29:22 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 18 19:29:22 2016 -0500

    Merge topic 'cpack-deb-autodep-ORIGIN-RPATH' into next
    
    b8263a2f CPack/Deb Create DEBIAN directory for dpkg-shlibdeps


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8263a2f8d6df42b2a37c2efc2f7a3ac2b1d658a
commit b8263a2f8d6df42b2a37c2efc2f7a3ac2b1d658a
Author:     Florian Apolloner and John Knottenbelt <john at introversion.co.uk>
AuthorDate: Fri Feb 19 01:27:36 2016 +0100
Commit:     Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Fri Feb 19 01:27:36 2016 +0100

    CPack/Deb Create DEBIAN directory for dpkg-shlibdeps
    
    If CMAKE_INSTALL_RPATH is set and contains $ORIGIN then
    dpkg-shlibdeps searches for the DEBIAN directory in order
    to resolve $ORIGIN in the rpath to a directory. We need to
    create the DEBIAN directory for this to work.

diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake
index 2aaef61..b41d926 100644
--- a/Modules/CPackDeb.cmake
+++ b/Modules/CPackDeb.cmake
@@ -504,6 +504,9 @@ function(cpack_deb_prepare_package_vars)
         file(MAKE_DIRECTORY ${CPACK_TEMPORARY_DIRECTORY}/debian)
         file(WRITE ${CPACK_TEMPORARY_DIRECTORY}/debian/control "")
 
+        # Create a DEBIAN directory so that dpkg-shlibdeps can find the package dir when resolving $ORIGIN.
+        file(MAKE_DIRECTORY "${CPACK_TEMPORARY_DIRECTORY}/DEBIAN")
+
         # Add --ignore-missing-info if the tool supports it
         execute_process(COMMAND env LC_ALL=C ${SHLIBDEPS_EXECUTABLE} --help
           OUTPUT_VARIABLE _TMP_HELP
@@ -544,6 +547,9 @@ function(cpack_deb_prepare_package_vars)
         # Remove blank control file
         # Might not be safe if package actual contain file or directory named debian
         file(REMOVE_RECURSE "${CPACK_TEMPORARY_DIRECTORY}/debian")
+
+        # remove temporary directory that was created only for dpkg-shlibdeps execution
+        file(REMOVE_RECURSE "${CPACK_TEMPORARY_DIRECTORY}/DEBIAN")
       else()
         if(CPACK_DEBIAN_PACKAGE_DEBUG)
           message(AUTHOR_WARNING "CPackDeb Debug: Using only user-provided depends because package does not contain executable files that link to shared libraries.")

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

Summary of changes:
 Modules/CPackDeb.cmake |    6 ++++++
 1 file changed, 6 insertions(+)


hooks/post-receive
-- 
CMake