aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarath Kannan <barathsotd@gmail.com>2016-11-08 22:16:13 +1100
committerBarath Kannan <barathsotd@gmail.com>2016-11-08 22:16:13 +1100
commit15f3aa7ce624894ee4a4e3b2efa6f96a9014d41d (patch)
treefb41a0ab817c58cc6b007685f77022d3abce4159
parent2e7b260b32454d32fb10cc9d838409f82c7744b8 (diff)
downloadvcpkg-15f3aa7ce624894ee4a4e3b2efa6f96a9014d41d.tar.gz
vcpkg-15f3aa7ce624894ee4a4e3b2efa6f96a9014d41d.zip
plugin fixes
-rw-r--r--ports/qt5/portfile.cmake14
1 files changed, 13 insertions, 1 deletions
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")