From a5d13e19dd7f6037e10b649c49805922ae5e0fa6 Mon Sep 17 00:00:00 2001
From: SineStriker <trueful@163.com>
Date: 周五, 22 12月 2023 17:04:29 +0800
Subject: [PATCH] Prepare to remove style support again
---
src/CMakeLists.txt | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb6be77..739c9f8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,7 +14,7 @@
set(QMSETUP_DEFINITION_SCOPE DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
set(QMSETUP_DEFINITION_NUMERICAL on)
-qm_add_definition(QWINDOWKIT_TEST_CONFIG true)
+qm_add_definition(QWINDOWKIT_FORCE_QT_WINDOW_CONTEXT CONDITION QWINDOWKIT_FORCE_QT_WINDOW_CONTEXT)
qm_generate_config(${QWINDOWKIT_BUILD_INCLUDE_DIR}/QWKCore/qwkconfig.h)
@@ -27,7 +27,7 @@
# ----------------------------------
# CMake API
# ----------------------------------
-function(qwk_add_library _target)
+macro(qwk_add_library _target)
set(options AUTOGEN NO_SYNC_INCLUDE NO_WIN_RC)
set(oneValueArgs SYNC_INCLUDE_PREFIX PREFIX)
set(multiValueArgs SYNC_INCLUDE_OPTIONS)
@@ -69,6 +69,7 @@
# Add include directories
target_include_directories(${_target} PRIVATE ${QWINDOWKIT_BUILD_INCLUDE_DIR})
+ target_include_directories(${_target} PRIVATE .)
# Library name
if(${_target} MATCHES "^QWK(.+)")
@@ -114,16 +115,12 @@
"$<BUILD_INTERFACE:${QWINDOWKIT_GENERATED_INCLUDE_DIR}>"
)
endif()
-endfunction()
+endmacro()
# ----------------------------------
# Main Project
# ----------------------------------
add_subdirectory(core)
-
-if(QWINDOWKIT_BUILD_STYLE_SUPPORT)
- add_subdirectory(stylesupport)
-endif()
if(QWINDOWKIT_BUILD_WIDGETS)
add_subdirectory(widgets)
@@ -207,7 +204,5 @@
)
# Install shared files
- install(DIRECTORY ../share/
- DESTINATION share/${QWINDOWKIT_INSTALL_NAME}
- )
+ include("../share/install.cmake")
endif()
\ No newline at end of file
--
Gitblit v1.9.1