Mentalflow
/
RibbonUI
mirror of https://github.com/mentalfl0w/RibbonUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMakeLists: Move qwindowkit to 3rdparty.

This commit is contained in:
Mentalflow 2024-05-09 09:07:51 +08:00
parent 48b20e22f7
commit 7746042e63
Signed by: Mentalflow
GPG Key ID: 5AE68D4401A2EE71
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -1,3 +1,3 @@
[submodule "lib_source/3rdparty/qwindowkit"] [submodule "3rdparty/qwindowkit"]
path = lib_source/3rdparty/qwindowkit path = 3rdparty/qwindowkit
url = https://github.com/stdware/qwindowkit.git url = https://github.com/stdware/qwindowkit.git

1
3rdparty/qwindowkit vendored Submodule

@ -0,0 +1 @@
Subproject commit 357532958f2e806c69c96f018333a45e65e35201

14
CMakeLists.txt
View File

@ -10,10 +10,24 @@ option(RIBBONUI_BUILD_EXAMPLES "Build RibbonUI APP." ON)
option(RIBBONUI_BUILD_QWINDOWKIT "Build QWindowKit." ON) option(RIBBONUI_BUILD_QWINDOWKIT "Build QWindowKit." ON)
option(RIBBONUI_BUILD_STATIC_LIB "Build RibbonUI static library." OFF) option(RIBBONUI_BUILD_STATIC_LIB "Build RibbonUI static library." OFF)
if(APPLE)
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
endif()
if(NOT RIBBONUI_QML_PLUGIN_DIRECTORY) if(NOT RIBBONUI_QML_PLUGIN_DIRECTORY)
set(RIBBONUI_QML_PLUGIN_DIRECTORY ${QT_SDK_DIR}/qml/RibbonUI CACHE PATH "RibbonUI Plugin Path") set(RIBBONUI_QML_PLUGIN_DIRECTORY ${QT_SDK_DIR}/qml/RibbonUI CACHE PATH "RibbonUI Plugin Path")
endif() endif()
if (RIBBONUI_BUILD_QWINDOWKIT)
set(QWINDOWKIT_BUILD_STATIC ON)
set(QWINDOWKIT_BUILD_EXAMPLES OFF)
set(QWINDOWKIT_BUILD_QUICK ON)
set(QWINDOWKIT_BUILD_WIDGETS OFF)
set(QWINDOWKIT_ENABLE_STYLE_AGENT ON)
set(QWINDOWKIT_INSTALL OFF)
add_subdirectory(3rdparty/qwindowkit)
endif()
add_subdirectory(lib_source) add_subdirectory(lib_source)
if (RIBBONUI_BUILD_EXAMPLES) if (RIBBONUI_BUILD_EXAMPLES)

1
lib_source/3rdparty/qwindowkit vendored

@ -1 +0,0 @@
Subproject commit 0177eedd03bd9a75dafea296f77b8a6bdad9c3cb

10
lib_source/CMakeLists.txt
View File

@ -20,16 +20,6 @@ if(APPLE)
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE) set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
endif() endif()
if (RIBBONUI_BUILD_QWINDOWKIT)
set(QWINDOWKIT_BUILD_STATIC ON)
set(QWINDOWKIT_BUILD_EXAMPLES OFF)
set(QWINDOWKIT_BUILD_QUICK ON)
set(QWINDOWKIT_BUILD_WIDGETS OFF)
set(QWINDOWKIT_ENABLE_STYLE_AGENT ON)
set(QWINDOWKIT_INSTALL OFF)
add_subdirectory(3rdparty/qwindowkit)
endif()
find_package(Qt6 COMPONENTS Core Quick Qml REQUIRED) find_package(Qt6 COMPONENTS Core Quick Qml REQUIRED)
set(version_str "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH}") set(version_str "${PROJECT_VERSION_MAJOR},${PROJECT_VERSION_MINOR},${PROJECT_VERSION_PATCH}")