3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-30 20:59:12 +08:00
Code Issues Projects Releases Wiki Activity

[qt5-base] Fix hardcoded absolute paths in DLLs (#3280)

Browse Source 
* Fix Qt5 hardcoded absolute paths within DLLs

* Increase patch version number in qt5-base
This commit is contained in:
Claudio Fantacci 2018-09-21 06:01:15 +09:00 committed by Robert Schumacher
parent 765a9f06e6
commit 90e627c7e6
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ports/qt5-base/configure_qt.cmake
View File

@ -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()
endfunction()