168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add optional components

This commit is contained in:
Rick Vogel 2022-10-30 20:19:31 +01:00
parent 8a4307ebac
commit 48c3bb41b1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -39,17 +39,18 @@ endif()
if("${Qt5_DIR}" STREQUAL "" AND "${Qt6_DIR}" STREQUAL "") if("${Qt5_DIR}" STREQUAL "" AND "${Qt6_DIR}" STREQUAL "")
message(FATAL_ERROR "Neither Qt5_DIR nor Qt6_DIR defined!") message(FATAL_ERROR "Neither Qt5_DIR nor Qt6_DIR defined!")
else() else()
# TODO ckeck find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets)
if(NOT "${Qt5_DIR}" STREQUAL "") if(NOT "${Qt5_DIR}" STREQUAL "")
find_package(Qt5 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg WebEngine WebEngineCore Widgets) find_package(Qt5 REQUIRED COMPONENTS Core Gui OpenGL Quick Svg Widgets)
set(Qt Qt${Qt5_VERSION_MAJOR}) # TODO find better solution for Qt namespace find_package(Qt5 OPTIONAL_COMPONENTS QuickWidgets WebEngine WebEngineCore)
set(Qt Qt${Qt5_VERSION_MAJOR})
set(Qt_VERSION ${Qt5_VERSION}) set(Qt_VERSION ${Qt5_VERSION})
set(Qt_VERSION_MAJOR ${Qt5_VERSION_MAJOR}) set(Qt_VERSION_MAJOR ${Qt5_VERSION_MAJOR})
set(Qt_VERSION_MINOR ${Qt5_VERSION_MINOR}) set(Qt_VERSION_MINOR ${Qt5_VERSION_MINOR})
set(Qt_VERSION_PATCH ${Qt5_VERSION_PATCH}) set(Qt_VERSION_PATCH ${Qt5_VERSION_PATCH})
elseif(NOT "${Qt6_DIR}" STREQUAL "") elseif(NOT "${Qt6_DIR}" STREQUAL "")
find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg WebEngineCore WebEngineQuick Widgets) find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg Widgets)
set(Qt Qt${Qt6_VERSION_MAJOR}) # TODO find better solution for Qt namespace find_package(Qt5 OPTIONAL_COMPONENTS QuickWidgets WebEngineCore WebEngineQuick)
set(Qt Qt${Qt6_VERSION_MAJOR})
set(Qt_VERSION ${Qt6_VERSION}) set(Qt_VERSION ${Qt6_VERSION})
set(Qt_VERSION_MAJOR ${Qt6_VERSION_MAJOR}) set(Qt_VERSION_MAJOR ${Qt6_VERSION_MAJOR})
set(Qt_VERSION_MINOR ${Qt6_VERSION_MINOR}) set(Qt_VERSION_MINOR ${Qt6_VERSION_MINOR})