From 5e12d4d4f27e4ce27a8c9e6145bc6e45840e00f2 Mon Sep 17 00:00:00 2001
From: Sine Striker <trueful@163.com>
Date: 周日, 17 12月 2023 15:11:48 +0800
Subject: [PATCH] Add qmake and msbuild config files
---
src/CMakeLists.txt | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb6be77..25d290a 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,7 +115,7 @@
"$<BUILD_INTERFACE:${QWINDOWKIT_GENERATED_INCLUDE_DIR}>"
)
endif()
-endfunction()
+endmacro()
# ----------------------------------
# Main Project
@@ -207,7 +208,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