[Cmake-commits] CMake branch, next, updated. v3.2.1-1213-g5fa4e63

[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  5fa4e63ef5ec17d068a75700d5e40127ec82d2db (commit)
       via  9c76ff015a393a2a5107a9db7f8ba91eb12c4ffa (commit)
      from  7ae7789e06051a8b8db16c5e3d2e7ef43ce44c6d (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=5fa4e63ef5ec17d068a75700d5e40127ec82d2db
commit 5fa4e63ef5ec17d068a75700d5e40127ec82d2db
Merge: 7ae7789 9c76ff0
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Mar 24 22:57:53 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 24 22:57:53 2015 -0400

    Merge topic 'qtdialog-cpack-qt5-osx' into next
    
    9c76ff01 QtDialog: Fix CMake packaging with CPack on OS X with Qt5.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9c76ff015a393a2a5107a9db7f8ba91eb12c4ffa
commit 9c76ff015a393a2a5107a9db7f8ba91eb12c4ffa
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Mar 24 20:55:59 2015 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue Mar 24 20:56:38 2015 -0600

    QtDialog: Fix CMake packaging with CPack on OS X with Qt5.

diff --git a/Source/QtDialog/CMakeLists.txt b/Source/QtDialog/CMakeLists.txt
index b59af94..9cc993a 100644
--- a/Source/QtDialog/CMakeLists.txt
+++ b/Source/QtDialog/CMakeLists.txt
@@ -45,11 +45,11 @@ if (Qt5Widgets_FOUND)
         get_filename_component(_qt_plugin_file "${_qt_plugin_path}" NAME)
         get_filename_component(_qt_plugin_type "${_qt_plugin_path}" PATH)
         get_filename_component(_qt_plugin_type "${_qt_plugin_type}" NAME)
-        set(_qt_plugin_dest "${CMAKE_INSTALL_PREFIX}/PlugIns/${_qt_plugin_type}")
+        set(_qt_plugin_dest "PlugIns/${_qt_plugin_type}")
         install(FILES "${_qt_plugin_path}"
           DESTINATION "${_qt_plugin_dest}")
         set(${_qt_plugins_var}
-          "${${_qt_plugins_var}};${_qt_plugin_dest}/${_qt_plugin_file}")
+          "${${_qt_plugins_var}};\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${_qt_plugin_dest}/${_qt_plugin_file}")
       else()
         message(FATAL_ERROR "QT plugin ${_qt_plugin_name} not found")
       endif()

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

Summary of changes:
 Source/QtDialog/CMakeLists.txt |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake