diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-02-23 03:34:21 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-02-23 03:34:21 -0800 |
| commit | dd6d1aa560985c4b508f6f0f5259e03ddfaba262 (patch) | |
| tree | 3c3279d89715502a69443d6796417ee94c799283 /ports/qt5/fixcmake.py | |
| parent | 7dd7490468019b696859331f1f686890d8aaf556 (diff) | |
| download | vcpkg-dd6d1aa560985c4b508f6f0f5259e03ddfaba262.tar.gz vcpkg-dd6d1aa560985c4b508f6f0f5259e03ddfaba262.zip | |
[qt5] Exercise full control over build configuration.
Bumps version to 5.7.1-2
This fixes several issues:
- Prevents a hang for user input during the build.
- Moves the tools into a subdirectory so their DLLs do not interfere with other packages.
- Adds the currently installed DLLs to the path so that tools compiled during the build can be run.
- Uses our system's copy of double-conversion.
- No longer uses looped builds; I haven't seen issues since the update to JOM 1.1.2
- Works around an issue with Qt5Bootstrap (QTBUG-55499)
Regressions to fix:
- Disables many subcomponents
Diffstat (limited to 'ports/qt5/fixcmake.py')
| -rw-r--r-- | ports/qt5/fixcmake.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ports/qt5/fixcmake.py b/ports/qt5/fixcmake.py index bd37c1e54..41b74606c 100644 --- a/ports/qt5/fixcmake.py +++ b/ports/qt5/fixcmake.py @@ -36,7 +36,7 @@ for f in files: builder += "\n " + line.replace("/plugins/", "/debug/plugins/") builder += " endif()\n" elif exepattern.search(line) != None: - builder += line.replace("/bin/", "/tools/") + builder += line.replace("/bin/", "/tools/qt5/") else: builder += line new_file = open(f, "w") |