From 245ddfa1f01b4c9fa10337246b8045755e5bcce5 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周二, 19 12月 2023 21:03:58 +0800
Subject: [PATCH] Change back to qScopeGuard
---
CMakeLists.txt | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11bfc38..ffbee08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,10 +8,11 @@
option(QWINDOWKIT_BUILD_STATIC "Build static libraries" OFF)
option(QWINDOWKIT_BUILD_WIDGETS "Build widgets module" ON)
option(QWINDOWKIT_BUILD_QUICK "Build quick module" ON)
-option(QWINDOWKIT_BUILD_STYLE_SUPPORT "Build style support module" ON)
option(QWINDOWKIT_BUILD_EXAMPLES "Build examples" OFF)
option(QWINDOWKIT_BUILD_DOCUMENTATIONS "Build documentations" OFF)
option(QWINDOWKIT_INSTALL "Install library" ON)
+
+option(QWINDOWKIT_FORCE_QT_WINDOW_CONTEXT "Enable Qt Window Context anyway" OFF)
# ----------------------------------
# CMake Settings
@@ -25,6 +26,9 @@
if(NOT DEFINED CMAKE_DEBUG_POSTFIX)
set(CMAKE_DEBUG_POSTFIX "d")
endif()
+elseif(MINGW)
+ set(CMAKE_STATIC_LIBRARY_PREFIX "")
+ set(CMAKE_SHARED_LIBRARY_PREFIX "")
endif()
if(QWINDOWKIT_INSTALL)
@@ -39,7 +43,7 @@
set(QWINDOWKIT_INSTALL_NAME ${PROJECT_NAME})
# ----------------------------------
-# Main Project
+# Find basic dependencies
# ----------------------------------
find_package(qmsetup QUIET)
@@ -65,6 +69,12 @@
set(qmsetup_DIR ${_package_path} CACHE PATH "" FORCE)
endif()
+qm_import(Filesystem)
+qm_init_directories()
+
+# ----------------------------------
+# Add source modules
+# ----------------------------------
add_subdirectory(src)
if(QWINDOWKIT_BUILD_EXAMPLES)
--
Gitblit v1.9.1