From dccc37e9d4344e89b5006f4dfe8db296e54ea1ad Mon Sep 17 00:00:00 2001 From: Shatur95 Date: Wed, 21 Oct 2020 20:48:51 +0300 Subject: [PATCH] Use QT_DEFAULT_MAJOR_VERSION --- CMakeLists.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 408fec2..ae1b143 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,23 +10,25 @@ add_library(${PROJECT_NAME} STATIC ) add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) -set(QT_MAJOR_VERSION 5 CACHE STRING "Qt version to use (5 or 6), defaults to 5") +if(NOT QT_DEFAULT_MAJOR_VERSION) + set(QT_DEFAULT_MAJOR_VERSION 5 CACHE STRING "Qt version to use (5 or 6), defaults to 5") +endif() # Find dependencies set(QT_COMPONENTS Core Network) -set(QT_LIBRARIES Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Network) +set(QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::Core Qt${QT_DEFAULT_MAJOR_VERSION}::Network) if(QAPPLICATION_CLASS STREQUAL QApplication) list(APPEND QT_COMPONENTS Widgets) - list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::Widgets) + list(APPEND QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::Widgets) elseif(QAPPLICATION_CLASS STREQUAL QGuiApplication) list(APPEND QT_COMPONENTS Gui) - list(APPEND QT_LIBRARIES Qt${QT_MAJOR_VERSION}::Gui) + list(APPEND QT_LIBRARIES Qt${QT_DEFAULT_MAJOR_VERSION}::Gui) else() set(QAPPLICATION_CLASS QCoreApplication) endif() -find_package(Qt${QT_MAJOR_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED) +find_package(Qt${QT_DEFAULT_MAJOR_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED) target_link_libraries(${PROJECT_NAME} PUBLIC ${QT_LIBRARIES})