philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: Make the frontend discovery shorter

Browse Source 
The fatal messages aren't needed, replaced by a REQUIRED find_package.
Added missing QtQuickControls find package from one branch, it was
only looking for QtQuick.
This commit is contained in:
Sergio Martins
2022-06-04 12:03:26 +01:00
parent ea9bf1ef0f
commit dc36435b35
1 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
CMakeLists.txt
View File

@@ -168,13 +168,12 @@ if (NOT KDDockWidgets_FRONTENDS)
message("No frontends specified explicitly.")
# qtwidgets
if (Qt${Qt_VERSION_MAJOR}Widgets_FOUND)
#message("Qt${Qt_VERSION_MAJOR}Widgets found, enabling qtwidgets frontend")
list(APPEND ENABLED_FRONTENDS "qtwidgets")
set(KDDW_FRONTEND_QTWIDGETS ON)
endif()
# qtquick
find_package(Qt${Qt_VERSION_MAJOR}Quick ${QT_MIN_VERSION})
if (Qt${Qt_VERSION_MAJOR}Quick_FOUND)
find_package(Qt${Qt_VERSION_MAJOR} ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS Quick QuickControls2)
if (Qt${Qt_VERSION_MAJOR}Quick_FOUND AND Qt${Qt_VERSION_MAJOR}QuickControls2_FOUND)
list(APPEND ENABLED_FRONTENDS "qtquick")
set(KDDW_FRONTEND_QTQUICK ON)
endif()
@@ -191,20 +190,13 @@ if (NOT KDDockWidgets_FRONTENDS)
else()
# qtwidgets
if ("qtwidgets" IN_LIST KDDockWidgets_FRONTENDS)
if (Qt${Qt_VERSION_MAJOR}Widgets_FOUND)
set(KDDW_FRONTEND_QTWIDGETS ON)
else()
message(FATAL_ERROR "qtwidgets specified in enabled frontends Qt${Qt_VERSION_MAJOR}Widgets not found on your system")
endif()
find_package(Qt${Qt_VERSION_MAJOR}Widgets ${QT_MIN_VERSION} REQUIRED)
set(KDDW_FRONTEND_QTWIDGETS ON)
endif()
# qtquick
if ("qtquick" IN_LIST KDDockWidgets_FRONTENDS)
find_package(Qt${Qt_VERSION_MAJOR}Quick ${QT_MIN_VERSION})
if (Qt${Qt_VERSION_MAJOR}Quick_FOUND)
set(KDDW_FRONTEND_QTQUICK ON)
else()
message(FATAL_ERROR "qtquick specified in enabled frontends Qt${Qt_VERSION_MAJOR}Quick not found on your system")
endif()
find_package(Qt${Qt_VERSION_MAJOR} ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS Quick QuickControls2)
set(KDDW_FRONTEND_QTQUICK ON)
endif()
endif()
# END frontend enabling
@@ -214,14 +206,11 @@ add_definitions(-DQT_NO_KEYWORDS)
if (KDDW_FRONTEND_QTWIDGETS)
add_definitions(-DKDDW_FRONTEND_QTWIDGETS)
find_package(Qt${Qt_VERSION_MAJOR}Widgets ${QT_MIN_VERSION} REQUIRED)
set(KDDockWidgets_DEPS "widgets")
endif()
if (KDDW_FRONTEND_QTQUICK)
add_definitions(-DKDDW_FRONTEND_QTQUICK)
find_package(Qt${Qt_VERSION_MAJOR}Quick REQUIRED)
find_package(Qt${Qt_VERSION_MAJOR}QuickControls2 REQUIRED)
set(KDDockWidgets_DEPS "${KDDockWidgets_DEPS} quick quickcontrols2")
endif()