diff options
| author | Claudio Fantacci <claudiofantacci@users.noreply.github.com> | 2018-09-21 06:01:15 +0900 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-09-20 14:01:15 -0700 |
| commit | 90e627c7e6312d5ab04060c186e55ac58edaa634 (patch) | |
| tree | 235d02de8e2c614f49a9e1b99cce07a60d7c7292 | |
| parent | 765a9f06e6b44dbcd8a9ebe10406379ef18043ac (diff) | |
| download | vcpkg-90e627c7e6312d5ab04060c186e55ac58edaa634.tar.gz vcpkg-90e627c7e6312d5ab04060c186e55ac58edaa634.zip | |
[qt5-base] Fix hardcoded absolute paths in DLLs (#3280)
* Fix Qt5 hardcoded absolute paths within DLLs
* Increase patch version number in qt5-base
| -rw-r--r-- | ports/qt5-base/configure_qt.cmake | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/ports/qt5-base/configure_qt.cmake b/ports/qt5-base/configure_qt.cmake index 356361a9b..b66f6d22e 100644 --- a/ports/qt5-base/configure_qt.cmake +++ b/ports/qt5-base/configure_qt.cmake @@ -30,12 +30,13 @@ function(configure_qt) vcpkg_execute_required_process( COMMAND "${_csc_SOURCE_PATH}/${CONFIGURE_BAT}" ${_csc_OPTIONS} ${_csc_OPTIONS_DEBUG} -debug - -prefix ${CURRENT_PACKAGES_DIR}/debug - -hostbindir ${CURRENT_PACKAGES_DIR}/debug/tools/qt5 - -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug - -datadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug - -plugindir ${CURRENT_PACKAGES_DIR}/debug/plugins - -qmldir ${CURRENT_PACKAGES_DIR}/debug/qml + -prefix ${CURRENT_INSTALLED_DIR}/debug + -extprefix ${CURRENT_PACKAGES_DIR}/debug + -hostbindir ${CURRENT_INSTALLED_DIR}/debug/tools/qt5 + -archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5/debug + -datadir ${CURRENT_INSTALLED_DIR}/share/qt5/debug + -plugindir ${CURRENT_INSTALLED_DIR}/debug/plugins + -qmldir ${CURRENT_INSTALLED_DIR}/debug/qml -headerdir ${CURRENT_PACKAGES_DIR}/include -I ${CURRENT_INSTALLED_DIR}/include -L ${CURRENT_INSTALLED_DIR}/debug/lib @@ -44,18 +45,19 @@ function(configure_qt) LOGNAME config-${TARGET_TRIPLET}-dbg ) message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done") - + message(STATUS "Configuring ${TARGET_TRIPLET}-rel") file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel) vcpkg_execute_required_process( COMMAND "${_csc_SOURCE_PATH}/${CONFIGURE_BAT}" ${_csc_OPTIONS} ${_csc_OPTIONS_RELEASE} -release - -prefix ${CURRENT_PACKAGES_DIR} - -hostbindir ${CURRENT_PACKAGES_DIR}/tools/qt5 - -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5 - -datadir ${CURRENT_PACKAGES_DIR}/share/qt5 - -plugindir ${CURRENT_PACKAGES_DIR}/plugins - -qmldir ${CURRENT_PACKAGES_DIR}/qml + -prefix ${CURRENT_INSTALLED_DIR} + -extprefix ${CURRENT_PACKAGES_DIR} + -hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5 + -archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5 + -datadir ${CURRENT_INSTALLED_DIR}/share/qt5 + -plugindir ${CURRENT_INSTALLED_DIR}/plugins + -qmldir ${CURRENT_INSTALLED_DIR}/qml -I ${CURRENT_INSTALLED_DIR}/include -L ${CURRENT_INSTALLED_DIR}/lib -platform ${_csc_PLATFORM} @@ -64,4 +66,4 @@ function(configure_qt) ) message(STATUS "Configuring ${TARGET_TRIPLET}-rel done") -endfunction()
\ No newline at end of file +endfunction() |