diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-27 13:15:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-03-27 13:15:09 (GMT) |
| commit | b6f67227f156794bc21c9cf2d6897a7e68410b67 (patch) | |
| tree | 84997cc4c486b07e6de3e3474318795b2f5c95f4 /Source | |
| parent | 685d179b8b8e0f0b98dbfd227f6ccd88b17749b0 (diff) | |
| parent | 9c76ff015a393a2a5107a9db7f8ba91eb12c4ffa (diff) | |
| download | CMake-b6f67227f156794bc21c9cf2d6897a7e68410b67.zip CMake-b6f67227f156794bc21c9cf2d6897a7e68410b67.tar.gz CMake-b6f67227f156794bc21c9cf2d6897a7e68410b67.tar.bz2 | |
Merge topic 'qtdialog-cpack-qt5-osx'
9c76ff01 QtDialog: Fix CMake packaging with CPack on OS X with Qt5.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/QtDialog/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
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() |