diff options
| author | yosagi <yosagi@users.noreply.github.com> | 2018-02-22 22:31:28 +0900 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-02-22 05:31:28 -0800 |
| commit | ef9d50ecb3a968062f1d7e47c3aa27e924eadf44 (patch) | |
| tree | a9df7ed21d901fdd032cee8dd88f3ef4041ff81a | |
| parent | 1f9c73454bfdf26f70f6976bc633deecc3bef22a (diff) | |
| download | vcpkg-ef9d50ecb3a968062f1d7e47c3aa27e924eadf44.tar.gz vcpkg-ef9d50ecb3a968062f1d7e47c3aa27e924eadf44.zip | |
Handle qt subpackage executable paths in cmake config files (#2844)
* Handle qt subpackage executable paths in cmake config files
* [qt5-modularscripts] Bump version to include changes to tool deployment
| -rw-r--r-- | ports/qt5-modularscripts/CONTROL | 2 | ||||
| -rw-r--r-- | ports/qt5-modularscripts/fixcmake.py | 13 | ||||
| -rw-r--r-- | ports/qt5-modularscripts/qt_modular_library.cmake | 2 |
3 files changed, 13 insertions, 4 deletions
diff --git a/ports/qt5-modularscripts/CONTROL b/ports/qt5-modularscripts/CONTROL index bf2ab2734..502887c52 100644 --- a/ports/qt5-modularscripts/CONTROL +++ b/ports/qt5-modularscripts/CONTROL @@ -1,3 +1,3 @@ Source: qt5-modularscripts -Version: 1 +Version: 2 Description: Vcpkg helpers to package qt5 modules diff --git a/ports/qt5-modularscripts/fixcmake.py b/ports/qt5-modularscripts/fixcmake.py index 923e600bc..83a40ec6c 100644 --- a/ports/qt5-modularscripts/fixcmake.py +++ b/ports/qt5-modularscripts/fixcmake.py @@ -1,8 +1,14 @@ import os import re +import sys from glob import glob +port="qt5" +if len(sys.argv) > 1: + port=sys.argv[1] + files = [y for x in os.walk('.') for y in glob(os.path.join(x[0], '*.cmake'))] +tooldir="/tools/"+port+"/" for f in files: openedfile = open(f, "r") @@ -10,6 +16,7 @@ for f in files: dllpattern = re.compile("_install_prefix}/bin/Qt5.*d.dll") libpattern = re.compile("_install_prefix}/lib/Qt5.*d.lib") exepattern = re.compile("_install_prefix}/bin/[a-z]+.exe") + toolexepattern = re.compile("_install_prefix}/tools/qt5/[a-z]+.exe") tooldllpattern = re.compile("_install_prefix}/tools/qt5/Qt5.*d.dll") for line in openedfile: if "_install_prefix}/tools/qt5/${LIB_LOCATION}" in line: @@ -49,9 +56,11 @@ for f in files: elif tooldllpattern.search(line) != None: builder += line.replace("/tools/qt5/", "/debug/bin/") elif exepattern.search(line) != None: - builder += line.replace("/bin/", "/tools/qt5/") + builder += line.replace("/bin/", tooldir) + elif toolexepattern.search(line) != None: + builder += line.replace("/tools/qt5/",tooldir) else: builder += line new_file = open(f, "w") new_file.write(builder) - new_file.close()
\ No newline at end of file + new_file.close() diff --git a/ports/qt5-modularscripts/qt_modular_library.cmake b/ports/qt5-modularscripts/qt_modular_library.cmake index 0301bcebc..e733e02a5 100644 --- a/ports/qt5-modularscripts/qt_modular_library.cmake +++ b/ports/qt5-modularscripts/qt_modular_library.cmake @@ -53,7 +53,7 @@ function(qt_modular_library NAME HASH) #Fix the cmake files if they exist if(EXISTS ${RELEASE_DIR}/lib/cmake) vcpkg_execute_required_process( - COMMAND ${PYTHON2} ${_qt5base_port_dir}/fixcmake.py + COMMAND ${PYTHON2} ${_qt5base_port_dir}/fixcmake.py ${PORT} WORKING_DIRECTORY ${RELEASE_DIR}/lib/cmake LOGNAME fix-cmake ) |