diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-11-09 15:22:47 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-11-09 15:22:47 -0800 |
| commit | 6b88c6894fdff177b3da15b88d5f74abf84f47cb (patch) | |
| tree | 024b1bfd98662f65c7b6b18b5e862edd907ab71e | |
| parent | 083e0a611f33496714b7e31161887e8026a29411 (diff) | |
| parent | bdcdb4408d9a42fde175ff755b913903b8c414b7 (diff) | |
| download | vcpkg-6b88c6894fdff177b3da15b88d5f74abf84f47cb.tar.gz vcpkg-6b88c6894fdff177b3da15b88d5f74abf84f47cb.zip | |
Merge pull request #262 from Barath-Kannan/qt5-plugin-fix
qt5 plugin fixes
| -rw-r--r-- | ports/qt5/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5/portfile.cmake | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index 1629819e8..accc2ba07 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,4 +1,4 @@ Source: qt5 -Version: 5.7 +Version: 5.7-1 Build-Depends: Description: Qt5 application framework main components. Webengine, examples and tests not included. diff --git a/ports/qt5/portfile.cmake b/ports/qt5/portfile.cmake index f65bee4ba..6b11a8abe 100644 --- a/ports/qt5/portfile.cmake +++ b/ports/qt5/portfile.cmake @@ -50,6 +50,7 @@ vcpkg_execute_required_process( -hostbindir ${CURRENT_PACKAGES_DIR}/tools -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5 -datadir ${CURRENT_PACKAGES_DIR}/share/qt5 + -plugindir ${CURRENT_PACKAGES_DIR}/plugins WORKING_DIRECTORY ${OUTPUT_PATH} LOGNAME configure-${TARGET_TRIPLET} ) @@ -115,9 +116,20 @@ file(REMOVE ${DEBUG_LIB_FILES}) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Gamepad.lib ${CURRENT_PACKAGES_DIR}/lib/Qt5Gamepad.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/Qt5Gamepad.prl ${CURRENT_PACKAGES_DIR}/lib/Qt5Gamepad.prl) file(GLOB BINARY_TOOLS "${CURRENT_PACKAGES_DIR}/bin/*.exe") - file(INSTALL ${BINARY_TOOLS} DESTINATION ${CURRENT_PACKAGES_DIR}/tools) file(REMOVE ${BINARY_TOOLS}) +file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins") +file(GLOB_RECURSE DEBUG_PLUGINS + "${CURRENT_PACKAGES_DIR}/plugins/*d.dll" + "${CURRENT_PACKAGES_DIR}/plugins/*d.pdb" +) +foreach(file ${DEBUG_PLUGINS}) + get_filename_component(file_n ${file} NAME) + file(RELATIVE_PATH file_rel "${CURRENT_PACKAGES_DIR}/plugins" ${file}) + get_filename_component(rel_dir ${file_rel} DIRECTORY) + file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/plugins/${rel_dir}") + file(RENAME ${file} "${CURRENT_PACKAGES_DIR}/debug/plugins/${rel_dir}/${file_n}") +endforeach() if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic) file(GLOB RELEASE_DLLS "${CURRENT_PACKAGES_DIR}/bin/*.dll") |