diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-04-09 18:55:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-09 09:55:53 -0700 |
| commit | c739e82beccbdc3ac63c6e1ec486445cbcb9a018 (patch) | |
| tree | 4f7372658841684809c1eddf51b70a19312c687d | |
| parent | 2d7a8443acca90ac05257c7a54c11567820bc050 (diff) | |
| download | vcpkg-c739e82beccbdc3ac63c6e1ec486445cbcb9a018.tar.gz vcpkg-c739e82beccbdc3ac63c6e1ec486445cbcb9a018.zip | |
[qt5] Move qt5 headers into qt5 subdir (#17158)
* [qt5] move headers
* version stuff
| -rw-r--r-- | ports/qt5-base/cmake/configure_qt.cmake | 3 | ||||
| -rw-r--r-- | ports/qt5-base/cmake/qt_fix_prl.cmake | 4 | ||||
| -rw-r--r-- | ports/qt5-base/vcpkg.json | 2 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/q-/qt5-base.json | 5 |
5 files changed, 12 insertions, 4 deletions
diff --git a/ports/qt5-base/cmake/configure_qt.cmake b/ports/qt5-base/cmake/configure_qt.cmake index 46e997bda..ea62b744a 100644 --- a/ports/qt5-base/cmake/configure_qt.cmake +++ b/ports/qt5-base/cmake/configure_qt.cmake @@ -103,11 +103,12 @@ function(configure_qt) -datadir ${CURRENT_INSTALLED_DIR}${_path_suffix}/share/qt5${_path_suffix_${_buildname}} -plugindir ${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/plugins -qmldir ${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/qml - -headerdir ${CURRENT_INSTALLED_DIR}/include + -headerdir ${CURRENT_INSTALLED_DIR}/include/qt5 -libexecdir ${CURRENT_INSTALLED_DIR}/tools/qt5${_path_suffix_${_buildname}} -bindir ${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/bin -libdir ${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/lib -I ${CURRENT_INSTALLED_DIR}/include + -I ${CURRENT_INSTALLED_DIR}/include/qt5 -L ${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/lib -L ${CURRENT_INSTALLED_DIR}${_path_suffix_${_buildname}}/lib/manual-link -platform ${_csc_TARGET_PLATFORM} diff --git a/ports/qt5-base/cmake/qt_fix_prl.cmake b/ports/qt5-base/cmake/qt_fix_prl.cmake index 7035534d8..551ec1134 100644 --- a/ports/qt5-base/cmake/qt_fix_prl.cmake +++ b/ports/qt5-base/cmake/qt_fix_prl.cmake @@ -1,11 +1,13 @@ function(qt_fix_prl PACKAGE_DIR PRL_FILES)
file(TO_CMAKE_PATH "${PACKAGE_DIR}/lib" CMAKE_LIB_PATH)
- file(TO_CMAKE_PATH "${PACKAGE_DIR}/include" CMAKE_INCLUDE_PATH)
+ file(TO_CMAKE_PATH "${PACKAGE_DIR}/include/qt5" CMAKE_INCLUDE_PATH)
+ file(TO_CMAKE_PATH "${PACKAGE_DIR}/include" CMAKE_INCLUDE_PATH2)
file(TO_CMAKE_PATH "${CURRENT_INSTALLED_DIR}" CMAKE_INSTALLED_PREFIX)
foreach(PRL_FILE IN LISTS PRL_FILES)
file(READ "${PRL_FILE}" _contents)
string(REPLACE "${CMAKE_LIB_PATH}" "\$\$[QT_INSTALL_LIBS]" _contents "${_contents}")
string(REPLACE "${CMAKE_INCLUDE_PATH}" "\$\$[QT_INSTALL_HEADERS]" _contents "${_contents}")
+ string(REPLACE "${CMAKE_INCLUDE_PATH2}" "\$\$[QT_INSTALL_HEADERS]/../" _contents "${_contents}")
string(REPLACE "${CMAKE_INSTALLED_PREFIX}" "\$\$[QT_INSTALL_PREFIX]" _contents "${_contents}")
#Note: This only works without an extra if case since QT_INSTALL_PREFIX is the same for debug and release
file(WRITE "${PRL_FILE}" "${_contents}")
diff --git a/ports/qt5-base/vcpkg.json b/ports/qt5-base/vcpkg.json index e71dbb245..7ff462eba 100644 --- a/ports/qt5-base/vcpkg.json +++ b/ports/qt5-base/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qt5-base", "version-string": "5.15.2", - "port-version": 4, + "port-version": 5, "description": "Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.", "homepage": "https://www.qt.io/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 9a6abb09d..e11e62c7d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4974,7 +4974,7 @@ }, "qt5-base": { "baseline": "5.15.2", - "port-version": 4 + "port-version": 5 }, "qt5-canvas3d": { "baseline": "0", diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 8b437940a..806f5b7a7 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "971d4936dfb79384d61cdafc9775b7caa2329135", + "version-string": "5.15.2", + "port-version": 5 + }, + { "git-tree": "6bd06b14752f1123c7d43df59ae19c584c24ea54", "version-string": "5.15.2", "port-version": 4 |