minor tweaks

SineStriker

2025-03-03 0aada6f97675200605951719f6629a0226cae0b8

minor tweaks

 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
# ----------------------------------

 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
)

 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
)

 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 . ..)

 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}

 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 &)>;