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

using find_package QT

This commit is contained in:
Rick Vogel 2022-12-20 15:23:59 +01:00
parent 1e06a7aef2
commit 647a9e2e80
5 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/cmake.yml vendored
View File

@ -353,7 +353,8 @@ jobs:
-G "${{ matrix.config.generators }}" \ -G "${{ matrix.config.generators }}" \
-DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \ -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
-DCMAKE_INSTALL_PREFIX:PATH=qskinny_install \ -DCMAKE_INSTALL_PREFIX:PATH=qskinny_install \
-DCMAKE_PREFIX_PATH:PATH="${{ matrix.config.cmake.qtprefixpath }}" -DCMAKE_PREFIX_PATH:PATH="${{ matrix.config.cmake.qtprefixpath }}" \
-D${{ matrix.config.cmake.qtdirkey }}:PATH="${{ matrix.config.cmake.qtdirvalue }}"
- name: Build ( QSkinny ) - name: Build ( QSkinny )
shell: bash shell: bash
@ -425,6 +426,7 @@ jobs:
-G "${{ matrix.config.generators }}" \ -G "${{ matrix.config.generators }}" \
-DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \ -DCMAKE_BUILD_TYPE=${{ matrix.config.build_type }} \
-DCMAKE_PREFIX_PATH:PATH="${{ matrix.config.cmake.qtprefixpath }}" \ -DCMAKE_PREFIX_PATH:PATH="${{ matrix.config.cmake.qtprefixpath }}" \
-D${{ matrix.config.cmake.qtdirkey }}:PATH="${{ matrix.config.cmake.qtdirvalue }}" \
-DQSkinny_DIR:PATH=$GITHUB_WORKSPACE/qskinny_install/lib/cmake/QSkinny -DQSkinny_DIR:PATH=$GITHUB_WORKSPACE/qskinny_install/lib/cmake/QSkinny
- name: Build ( CMake Integration Test ) - name: Build ( CMake Integration Test )

31
CMakeLists.txt
View File

@ -10,8 +10,8 @@ set(CMAKE_CXX_EXTENSIONS OFF)
include(${CMAKE_SOURCE_DIR}/features/qskconfig.cmake) include(${CMAKE_SOURCE_DIR}/features/qskconfig.cmake)
find_package(Qt6 COMPONENTS Core QUIET) find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Core)
if (NOT Qt6_FOUND) if(QT_VERSION_MAJOR VERSION_EQUAL "5")
find_package(Qt5 5.15 REQUIRED COMPONENTS Core Gui OpenGL Quick Svg Widgets) find_package(Qt5 5.15 REQUIRED COMPONENTS Core Gui OpenGL Quick Svg Widgets)
find_package(Qt5 5.15 OPTIONAL_COMPONENTS QuickWidgets WebEngine WebEngineCore) find_package(Qt5 5.15 OPTIONAL_COMPONENTS QuickWidgets WebEngine WebEngineCore)
message(WARNING "using QSkinny's 'qt_add_executable()'") message(WARNING "using QSkinny's 'qt_add_executable()'")
@ -22,34 +22,13 @@ if (NOT Qt6_FOUND)
function(qt_add_library) function(qt_add_library)
add_library(${ARGV}) add_library(${ARGV})
endfunction(qt_add_library) endfunction(qt_add_library)
else() elseif(QT_VERSION_MAJOR VERSION_EQUAL "6")
find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg Widgets) find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg Widgets)
find_package(Qt6 OPTIONAL_COMPONENTS QuickWidgets WebEngineCore WebEngineQuick) find_package(Qt6 OPTIONAL_COMPONENTS QuickWidgets WebEngineCore WebEngineQuick)
else()
message(FATAL_ERROR "Couldn't find any Qt version!")
endif() endif()
# find either Qt5 or Qt6 requred and optional components
#if(NOT "${Qt5_DIR}" STREQUAL "")
# find_package(Qt5 REQUIRED COMPONENTS Core Gui OpenGL Quick Svg Widgets)
# find_package(Qt5 OPTIONAL_COMPONENTS QuickWidgets WebEngine WebEngineCore)
# set(Qt Qt${Qt5_VERSION_MAJOR})
# set(Qt_VERSION ${Qt5_VERSION})
# set(Qt_VERSION_MAJOR ${Qt5_VERSION_MAJOR})
# set(Qt_VERSION_MINOR ${Qt5_VERSION_MINOR})
# set(Qt_VERSION_PATCH ${Qt5_VERSION_PATCH})
#elseif(NOT "${Qt6_DIR}" STREQUAL "")
# string(REPLACE "/lib/cmake/Qt6" "" Qt6_PREFIX_DIR "${Qt6_DIR}")
# set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${Qt6_PREFIX_DIR})
# find_package(Qt6 REQUIRED COMPONENTS Core Gui OpenGL Quick QuickWidgets Svg Widgets)
# find_package(Qt6 OPTIONAL_COMPONENTS QuickWidgets WebEngineCore WebEngineQuick) # check optional QuickWidgets Svg Widgets
# set(Qt Qt${Qt6_VERSION_MAJOR})
# set(Qt_VERSION ${Qt6_VERSION})
# set(Qt_VERSION_MAJOR ${Qt6_VERSION_MAJOR})
# set(Qt_VERSION_MINOR ${Qt6_VERSION_MINOR})
# set(Qt_VERSION_PATCH ${Qt6_VERSION_PATCH})
#else()
# message(FATAL_ERROR "Neither Qt5_DIR nor Qt6_DIR defined!")
#endif()
# optional package hunspell # optional package hunspell
if(NOT LINUX AND ENABLE_HUNSPELL) if(NOT LINUX AND ENABLE_HUNSPELL)
message(WARNING "Feature 'hunspell' only available for UNIX!") message(WARNING "Feature 'hunspell' only available for UNIX!")

2
playground/CMakeLists.txt
View File

@ -6,7 +6,7 @@ add_subdirectory(inputpanel)
add_subdirectory(images) add_subdirectory(images)
add_subdirectory(shadows) add_subdirectory(shadows)
if (Qt_VERSION_MAJOR VERSION_EQUAL "6") if (QT_VERSION_MAJOR VERSION_EQUAL "6")
if(TARGET Qt::WebEngineCore) if(TARGET Qt::WebEngineCore)
if(TARGET Qt::WebEngineQuick) if(TARGET Qt::WebEngineQuick)
add_subdirectory(webview) add_subdirectory(webview)

2
playground/webview/CMakeLists.txt
View File

@ -12,7 +12,7 @@ target_link_libraries(${TARGET_NAME}
qskinny qskinny
qsktestsupport) qsktestsupport)
if (Qt_VERSION_MAJOR VERSION_GREATER "5") if (QT_VERSION_MAJOR VERSION_GREATER "5")
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PRIVATE PRIVATE
Qt::WebEngineQuick Qt::WebEngineQuick

2
src/CMakeLists.txt
View File

@ -413,7 +413,7 @@ target_link_libraries(${TARGET_NAME}
Qt::Quick Qt::Quick
Qt::QuickPrivate) Qt::QuickPrivate)
if (Qt_VERSION_MAJOR VERSION_GREATER "5") if (QT_VERSION_MAJOR VERSION_GREATER "5")
target_link_libraries(${TARGET_NAME} target_link_libraries(${TARGET_NAME}
PUBLIC PUBLIC
Qt::OpenGL Qt::OpenGL