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

Handle qt subpackage executable paths in cmake config files (#2844)

Browse Source 
* Handle qt subpackage executable paths in cmake config files

* [qt5-modularscripts] Bump version to include changes to tool deployment
This commit is contained in:
yosagi 2018-02-22 22:31:28 +09:00 committed by Robert Schumacher
parent 1f9c73454b
commit ef9d50ecb3
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/qt5-modularscripts/CONTROL
View File

@ -1,3 +1,3 @@
Source: qt5-modularscripts
Version: 1
Version: 2
Description: Vcpkg helpers to package qt5 modules

13
ports/qt5-modularscripts/fixcmake.py
View File

@ -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()
new_file.close()

2
ports/qt5-modularscripts/qt_modular_library.cmake
View File

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