mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-29 04:59:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1847 from ShinNoNoir/qt5-fix-cmake-manual-link

Browse Source 
[qt5] Update fixcmake.py for new manual-link directories
This commit is contained in:
Robert Schumacher 2017-09-19 09:53:37 -07:00 committed by GitHub
commit 3de2bf5d8a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/qt5/CONTROL
View File

@ -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

12
ports/qt5/fixcmake.py
View File

@ -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"