Ver código fonte

Merge topic 'qtdialog-cpack-qt5-osx'

9c76ff01 QtDialog: Fix CMake packaging with CPack on OS X with Qt5.
Brad King 10 anos atrás
pai
commit
b6f67227f1
1 arquivos alterados com 2 adições e 2 exclusões
  1. 2 2
      Source/QtDialog/CMakeLists.txt

+ 2 - 2
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()