From 0aada6f97675200605951719f6629a0226cae0b8 Mon Sep 17 00:00:00 2001
From: SineStriker <55847490+SineStriker@users.noreply.github.com>
Date: 周一, 03 3月 2025 23:11:36 +0800
Subject: [PATCH] minor tweaks
---
examples/shared/widgetframe/CMakeLists.txt | 6 +-----
examples/qml/CMakeLists.txt | 6 +-----
examples/mainwindow/CMakeLists.txt | 6 +-----
src/CMakeLists.txt | 10 +++-------
CMakeLists.txt | 11 ++++++++++-
src/core/qwkglobal.h | 7 +++++++
6 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b2b5e4..3c03032 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,11 @@
cmake_minimum_required(VERSION 3.19)
-project(QWindowKit VERSION 1.4.0.0 LANGUAGES CXX)
+project(QWindowKit
+ VERSION 1.4.0.0
+ LANGUAGES CXX
+ HOMEPAGE_URL "https://github.com/stdware/qwindowkit"
+ DESCRIPTION "Cross-platform window customization framework"
+)
# ----------------------------------
# Build Options
@@ -69,6 +74,10 @@
set(QWINDOWKIT_VERSION ${PROJECT_VERSION})
set(QWINDOWKIT_INSTALL_NAME ${PROJECT_NAME})
+string(TIMESTAMP _QACTIONKIT_CURRENT_YEAR "%Y")
+set(QACTIONKIT_COPYRIGHT "Copyright 2023-${_QACTIONKIT_CURRENT_YEAR} Stdware Collections")
+set(QACTIONKIT_DESCRIPTION ${PROJECT_DESCRIPTION})
+
# ----------------------------------
# Find basic dependencies
# ----------------------------------
diff --git a/examples/mainwindow/CMakeLists.txt b/examples/mainwindow/CMakeLists.txt
index 24d2eab..644e733 100644
--- a/examples/mainwindow/CMakeLists.txt
+++ b/examples/mainwindow/CMakeLists.txt
@@ -3,12 +3,8 @@
file(GLOB _src *.h *.cpp)
qwk_add_example(${PROJECT_NAME}
+ FEATURES cxx_std_17
SOURCES ${_src} mainwindow.qrc ../shared/resources/shared.qrc
QT_LINKS Core Gui Widgets # MultimediaWidgets
LINKS QWKWidgets WidgetFrame
-)
-
-set_target_properties(${PROJECT_NAME} PROPERTIES
- CXX_STANDARD 17
- CXX_STANDARD_REQUIRED TRUE
)
\ No newline at end of file
diff --git a/examples/qml/CMakeLists.txt b/examples/qml/CMakeLists.txt
index 1755395..e99d23c 100644
--- a/examples/qml/CMakeLists.txt
+++ b/examples/qml/CMakeLists.txt
@@ -3,12 +3,8 @@
file(GLOB _src *.h *.cpp *.qrc)
qwk_add_example(${PROJECT_NAME}
+ FEATURES cxx_std_17
SOURCES ${_src} ../shared/resources/shared.qrc
QT_LINKS Core Gui Qml Quick
LINKS QWKQuick
-)
-
-set_target_properties(${PROJECT_NAME} PROPERTIES
- CXX_STANDARD 17
- CXX_STANDARD_REQUIRED TRUE
)
\ No newline at end of file
diff --git a/examples/shared/widgetframe/CMakeLists.txt b/examples/shared/widgetframe/CMakeLists.txt
index 05ac949..e4e2a9b 100644
--- a/examples/shared/widgetframe/CMakeLists.txt
+++ b/examples/shared/widgetframe/CMakeLists.txt
@@ -9,13 +9,9 @@
add_library(${PROJECT_NAME} STATIC)
qm_configure_target(${PROJECT_NAME}
+ FEATURES cxx_std_17
SOURCES ${_src}
QT_LINKS Core Gui Widgets
-)
-
-set_target_properties(${PROJECT_NAME} PROPERTIES
- CXX_STANDARD 17
- CXX_STANDARD_REQUIRED TRUE
)
target_include_directories(${PROJECT_NAME} PUBLIC . ..)
\ No newline at end of file
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 510c161..815e4da 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,5 @@
qm_import(Preprocess)
-string(TIMESTAMP _current_year "%Y")
-
-set(QWINDOWKIT_PROJECT_DESCRIPTION "Cross-platform window customization framework")
-set(QWINDOWKIT_PROJECT_COPYRIGHT "Copyright 2023-${_current_year} Stdware Collections")
set(QWINDOWKIT_GENERATED_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../include)
set(QWINDOWKIT_BUILD_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/../etc/include)
@@ -60,8 +56,8 @@
if(WIN32 AND NOT FUNC_NO_WIN_RC AND(${_type} STREQUAL "SHARED"))
qm_add_win_rc(${_target}
NAME ${QWINDOWKIT_INSTALL_NAME}
- DESCRIPTION ${QWINDOWKIT_PROJECT_DESCRIPTION}
- COPYRIGHT ${QWINDOWKIT_PROJECT_COPYRIGHT}
+ DESCRIPTION ${QWINDOWKIT_DESCRIPTION}
+ COPYRIGHT ${QACTIONKIT_COPYRIGHT}
)
endif()
@@ -164,7 +160,7 @@
qm_import(Doxygen)
qm_setup_doxygen(QWindowKit_RunDoxygen
NAME "QWindowKit"
- DESCRIPTION "${QWINDOWKIT_PROJECT_DESCRIPTION}"
+ DESCRIPTION "${QWINDOWKIT_DESCRIPTION}"
MDFILE ../README.md
OUTPUT_DIR ${CMAKE_BUILD_SHARE_DIR}/doc/${QWINDOWKIT_INSTALL_NAME}
INPUT ${QWINDOWKIT_ENABLED_SUBDIRECTORIES}
diff --git a/src/core/qwkglobal.h b/src/core/qwkglobal.h
index ded26b5..3e98112 100644
--- a/src/core/qwkglobal.h
+++ b/src/core/qwkglobal.h
@@ -34,6 +34,13 @@
# define QWINDOWKIT_CONFIG(feature) ((1 / QWINDOWKIT_##feature) == 1)
#endif
+#if defined(__GNUC__) || defined(__clang__)
+# define QWINDOWKIT_PRINTF_FORMAT(fmtpos, attrpos) \
+ __attribute__((__format__(__printf__, fmtpos, attrpos)))
+#else
+# define QWINDOWKIT_PRINTF_FORMAT(fmtpos, attrpos)
+#endif
+
namespace QWK {
using ScreenRectCallback = std::function<QRect(const QSize &)>;
--
Gitblit v1.9.1