diff options
Diffstat (limited to 'cmake/QbsBuildConfig.cmake')
| -rw-r--r-- | cmake/QbsBuildConfig.cmake | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/cmake/QbsBuildConfig.cmake b/cmake/QbsBuildConfig.cmake index b6614ce3f..8bdfec77e 100644 --- a/cmake/QbsBuildConfig.cmake +++ b/cmake/QbsBuildConfig.cmake @@ -3,6 +3,7 @@ option(WITH_UNIT_TESTS "Build Unit Tests" OFF) option(WITH_PROJECT_FILE_UPDATES "Enable project file updates support" ON) option(INSTALL_PUBLIC_HEADERS "Whether to install public headers" ON) option(QBS_ENABLE_RPATH "Whether to enable RPATH" ON) +option(QBS_USE_BUNDLED_QT_SCRIPT "Whether to use bundled QtScript module" OFF) option(QBS_INSTALL_HTML_DOCS "Whether to install HTML Documentation" OFF) option(QBS_INSTALL_QCH_DOCS "Whether to install QCH Documentation" OFF) @@ -54,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) @@ -239,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} ) |