diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-05-12 16:35:16 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-05-18 08:37:37 +0000 |
| commit | 287311ed774a86ef9ce053dd42e947cd28b48495 (patch) | |
| tree | b3fe3f16a83920df60d275411251e22de590bd57 /cmake | |
| parent | b1ccd9ab328cc7f7e34ab653ec93f389b9945e19 (diff) | |
cmake: Add Qt6 build
Also, switch Linux CMake job to build Qbs with Qt6
Change-Id: I188845a7cc086a8c87dbb7445ea95f99b26d94ef
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QbsBuildConfig.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/QbsBuildConfig.cmake b/cmake/QbsBuildConfig.cmake index a1eecded8..8bdfec77e 100644 --- a/cmake/QbsBuildConfig.cmake +++ b/cmake/QbsBuildConfig.cmake @@ -55,9 +55,9 @@ endif() function(get_update_path_command var) if(WIN32) - get_target_property(_QTCORE_LIBRARY Qt5::Core IMPORTED_LOCATION_RELEASE) + get_target_property(_QTCORE_LIBRARY Qt${QT_VERSION_MAJOR}::Core IMPORTED_LOCATION_RELEASE) if(NOT _QTCORE_LIBRARY) - get_target_property(_QTCORE_LIBRARY Qt5::Core IMPORTED_LOCATION_DEBUG) + get_target_property(_QTCORE_LIBRARY Qt${QT_VERSION_MAJOR}::Core IMPORTED_LOCATION_DEBUG) endif() get_filename_component(_QT_LIBRARY_PATH "${_QTCORE_LIBRARY}" DIRECTORY) get_target_property(_QBS_LIBRARY_PATH qbscore LIBRARY_OUTPUT_DIRECTORY) @@ -240,7 +240,7 @@ function(add_qbs_test test_name) ) target_link_libraries( ${target_name} - PRIVATE ${_arg_DEPENDS} qbscore qbsconsolelogger Qt5::Test + PRIVATE ${_arg_DEPENDS} qbscore qbsconsolelogger Qt${QT_VERSION_MAJOR}::Test PUBLIC ${_arg_PUBLIC_DEPENDS} ) |