[Cmake-commits] CMake branch, next, updated. v2.8.9-102-g62f3171

[Clinton Stimpson]

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  62f31715127cd7a6f267af9c5f68d219173540bb (commit)
       via  1e3248c9d0396e9c8b417eb35636ed951ca85988 (commit)
      from  1aba075e16a5cb58bfa9bba472e1e6465709b2e3 (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=62f31715127cd7a6f267af9c5f68d219173540bb
commit 62f31715127cd7a6f267af9c5f68d219173540bb
Merge: 1aba075 1e3248c
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Aug 15 21:38:56 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 15 21:38:56 2012 -0400

    Merge topic 'deployqt4-destdir' into next
    
    1e3248c DeployQt4:  Include DESTDIR for some cpack generators.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1e3248c9d0396e9c8b417eb35636ed951ca85988
commit 1e3248c9d0396e9c8b417eb35636ed951ca85988
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Wed Aug 15 19:36:50 2012 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Wed Aug 15 19:36:50 2012 -0600

    DeployQt4:  Include DESTDIR for some cpack generators.

diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake
index 6190abe..309fce3 100644
--- a/Modules/DeployQt4.cmake
+++ b/Modules/DeployQt4.cmake
@@ -101,7 +101,7 @@ function(resolve_qt4_paths paths_var)
                         if(${executable_path})
                                 list(APPEND paths_resolved "${executable_path}/${path}")
                         else()
-                                list(APPEND paths_resolved "\${CMAKE_INSTALL_PREFIX}/${path}")
+                                list(APPEND paths_resolved "\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${path}")
                         endif()
                 endif()
         endforeach()
@@ -295,7 +295,7 @@ function(install_qt4_executable executable)
         install(CODE
   "include(\"${DeployQt4_cmake_dir}/DeployQt4.cmake\")
   set(BU_CHMOD_BUNDLE_ITEMS TRUE)
-  FIXUP_QT4_EXECUTABLE(\"\${CMAKE_INSTALL_PREFIX}/${executable}\" \"\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" \"${request_qt_conf}\")"
+  FIXUP_QT4_EXECUTABLE(\"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${executable}\" \"\" \"${libs}\" \"${dirs}\" \"${plugins_dir}\" \"${request_qt_conf}\")"
                 ${component}
         )
 endfunction()

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

Summary of changes:
 Modules/DeployQt4.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake