AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: allow $$[QT_INSTALL_PREFIX]

Browse Source 
This is used in QtPurchasing.

Change-Id: I29c3a87d844eeaf3fd1b64057e33d64054f14a89
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Frederik Gladhorn 2019-10-04 16:47:56 +02:00
parent 7bca6edc16
commit 123ef6c391
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/cmake/pro2cmake.py
View File

@ -2627,6 +2627,7 @@ def write_main_part(
if destdir: if destdir:
if destdir.startswith("./") or destdir.startswith("../"): if destdir.startswith("./") or destdir.startswith("../"):
destdir = f"${{CMAKE_CURRENT_BINARY_DIR}}/{destdir}" destdir = f"${{CMAKE_CURRENT_BINARY_DIR}}/{destdir}"
destdir = destdir.replace("$$[QT_INSTALL_PREFIX]", "${INSTALL_DIRECTORY}")
extra_lines.append(f'OUTPUT_DIRECTORY "{destdir}"') extra_lines.append(f'OUTPUT_DIRECTORY "{destdir}"')
cm_fh.write(f"{spaces(indent)}{cmake_function}({name}\n") cm_fh.write(f"{spaces(indent)}{cmake_function}({name}\n")
@ -2795,6 +2796,7 @@ def write_binary(cm_fh: IO[str], scope: Scope, gui: bool = False, *, indent: int
target_path = scope.get_string("target.path") target_path = scope.get_string("target.path")
if target_path: if target_path:
target_path = target_path.replace("$$[QT_INSTALL_PREFIX]", "${INSTALL_DIRECTORY}")
target_path = target_path.replace("$$[QT_INSTALL_EXAMPLES]", "${INSTALL_EXAMPLESDIR}") target_path = target_path.replace("$$[QT_INSTALL_EXAMPLES]", "${INSTALL_EXAMPLESDIR}")
target_path = target_path.replace("$$[QT_INSTALL_TESTS]", "${INSTALL_TESTSDIR}") target_path = target_path.replace("$$[QT_INSTALL_TESTS]", "${INSTALL_TESTSDIR}")
target_path = target_path.replace("$$TARGET", scope.TARGET) target_path = target_path.replace("$$TARGET", scope.TARGET)