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

Correct Examples install directory

Browse Source 
Set the example install directory based on the path specified in
target.path qmake property.

Change-Id: Ia791995a3241fbf2f5ea1e48f2b9f93a90f1c3d7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Leander Beernaert 2019-10-09 11:23:03 +02:00
parent 87ba355d95
commit af7b0534c6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
util/cmake/pro2cmake.py
View File

@ -2921,6 +2921,11 @@ def write_example(
binary_name = scope.TARGET binary_name = scope.TARGET
assert binary_name assert binary_name
example_install_dir = scope.get_string('target.path')
if not example_install_dir:
example_install = 'examples'
example_install_dir = example_install_dir.replace('$$[QT_INSTALL_EXAMPLES]', 'examples')
cm_fh.write( cm_fh.write(
"cmake_minimum_required(VERSION 3.14)\n" "cmake_minimum_required(VERSION 3.14)\n"
f"project({binary_name} LANGUAGES CXX)\n\n" f"project({binary_name} LANGUAGES CXX)\n\n"
@ -2928,7 +2933,7 @@ def write_example(
"set(CMAKE_AUTOMOC ON)\n" "set(CMAKE_AUTOMOC ON)\n"
"set(CMAKE_AUTORCC ON)\n" "set(CMAKE_AUTORCC ON)\n"
"set(CMAKE_AUTOUIC ON)\n\n" "set(CMAKE_AUTOUIC ON)\n\n"
'set(INSTALL_EXAMPLEDIR "examples")\n\n' f'set(INSTALL_EXAMPLEDIR "{example_install_dir}")\n\n'
) )
(public_libs, private_libs) = extract_cmake_libraries(scope) (public_libs, private_libs) = extract_cmake_libraries(scope)