diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-09-19 09:53:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-19 09:53:37 -0700 |
| commit | 3de2bf5d8a268ca9ec68109980c936a6c291dbfe (patch) | |
| tree | 6d03bc8ac579151c5e8d0fe6177d6d0912b8f9fe | |
| parent | c2a735f6bee792d2419b0616eaa84abef91536e6 (diff) | |
| parent | 6d98ee5d9c76c7b62aed0b2825747fc516604f39 (diff) | |
| download | vcpkg-3de2bf5d8a268ca9ec68109980c936a6c291dbfe.tar.gz vcpkg-3de2bf5d8a268ca9ec68109980c936a6c291dbfe.zip | |
Merge pull request #1847 from ShinNoNoir/qt5-fix-cmake-manual-link
[qt5] Update fixcmake.py for new manual-link directories
| -rw-r--r-- | ports/qt5/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5/fixcmake.py | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ports/qt5/CONTROL b/ports/qt5/CONTROL index 704bc9ca5..ce46d249b 100644 --- a/ports/qt5/CONTROL +++ b/ports/qt5/CONTROL @@ -1,4 +1,4 @@ Source: qt5 -Version: 5.8-5 +Version: 5.8-6 Description: Qt5 application framework main components. Webengine, examples and tests not included. Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre, harfbuzz, sqlite3, libpq, double-conversion diff --git a/ports/qt5/fixcmake.py b/ports/qt5/fixcmake.py index 93a535fa2..b081af58e 100644 --- a/ports/qt5/fixcmake.py +++ b/ports/qt5/fixcmake.py @@ -18,6 +18,10 @@ for f in files: builder += "\n " + line.replace("/bin/", "/debug/bin/") builder += " endif()\n" elif "_install_prefix}/lib/${LIB_LOCATION}" in line: + # Qt5AxServer(d).lib has been moved to manual-link: + if '_qt5AxServer_install_prefix' in line: + line = line.replace('/lib/', '/lib/manual-link/') + builder += " if (${Configuration} STREQUAL \"RELEASE\")" builder += "\n " + line builder += " else()" @@ -30,7 +34,8 @@ for f in files: builder += "\n " + line.replace("/lib/", "/debug/lib/") builder += " endif()\n" elif "_install_prefix}/lib/qtmaind.lib" in line: - builder += line.replace("/lib/", "/debug/lib/") + # qtmaind.lib has been moved to manual-link: + builder += line.replace("/lib/", "/debug/lib/manual-link/") elif "_install_prefix}/plugins/${PLUGIN_LOCATION}" in line: builder += " if (${Configuration} STREQUAL \"RELEASE\")" builder += "\n " + line @@ -38,8 +43,9 @@ for f in files: builder += "\n " + line.replace("/plugins/", "/debug/plugins/") builder += " endif()\n" elif "_install_prefix}/lib/qtmain.lib" in line: - builder += line - builder += " set(imported_location_debug \"${_qt5Core_install_prefix}/debug/lib/qtmaind.lib\")\n" + # qtmain(d).lib has been moved to manual-link: + builder += line.replace("/lib/", "/lib/manual-link/") + builder += " set(imported_location_debug \"${_qt5Core_install_prefix}/debug/lib/manual-link/qtmaind.lib\")\n" builder += "\n" builder += " set_target_properties(Qt5::WinMain PROPERTIES\n" builder += " IMPORTED_LOCATION_DEBUG ${imported_location_debug}\n" |