From 2405bec2756ed88013f5a7f17d37b8747bc3028e Mon Sep 17 00:00:00 2001 From: Sine Striker <trueful@163.com> Date: ćšć, 30 5æ 2024 15:41:42 +0800 Subject: [PATCH] Fix static macro in QMake --- share/qmake/QWKCore.pri.in | 2 ++ share/qmake/QWKQuick.pri.in | 2 ++ share/qmake/QWKWidgets.pri.in | 2 ++ share/install.cmake | 6 ++++++ 4 files changed, 12 insertions(+), 0 deletions(-) diff --git a/share/install.cmake b/share/install.cmake index b8a6c5d..0080395 100644 --- a/share/install.cmake +++ b/share/install.cmake @@ -23,6 +23,12 @@ set(QMAKE_QWK_WIDGETS_NAME_DEBUG QWKWidgets${CMAKE_DEBUG_POSTFIX}) set(QMAKE_QWK_QUICK_NAME_DEBUG QWKQuick${CMAKE_DEBUG_POSTFIX}) + if(QWINDOWKIT_BUILD_STATIC) + set(QMAKE_QWK_CORE_STATIC_MACRO "DEFINES += QWK_CORE_STATIC") + set(QMAKE_QWK_WIDGETS_STATIC_MACRO "DEFINES += QWK_WIDGETS_STATIC") + set(QMAKE_QWK_QUICK_STATIC_MACRO "DEFINES += QWK_QUICK_STATIC") + endif() + file(GLOB _qmake_components "${CMAKE_CURRENT_LIST_DIR}/qmake/*.pri.in") foreach(_item IN LISTS _qmake_components) diff --git a/share/qmake/QWKCore.pri.in b/share/qmake/QWKCore.pri.in index a07cd80..978f9fb 100644 --- a/share/qmake/QWKCore.pri.in +++ b/share/qmake/QWKCore.pri.in @@ -20,4 +20,6 @@ } else { LIBS += -l@QMAKE_QWK_CORE_NAME_RELEASE@ } + + @QMAKE_QWK_CORE_STATIC_MACRO@ } \ No newline at end of file diff --git a/share/qmake/QWKQuick.pri.in b/share/qmake/QWKQuick.pri.in index 4c6bdd1..c56f4fe 100644 --- a/share/qmake/QWKQuick.pri.in +++ b/share/qmake/QWKQuick.pri.in @@ -8,4 +8,6 @@ } else { LIBS += -l@QMAKE_QWK_QUICK_NAME_RELEASE@ } + + @QMAKE_QWK_QUICK_STATIC_MACRO@ } \ No newline at end of file diff --git a/share/qmake/QWKWidgets.pri.in b/share/qmake/QWKWidgets.pri.in index ca76273..6976c91 100644 --- a/share/qmake/QWKWidgets.pri.in +++ b/share/qmake/QWKWidgets.pri.in @@ -8,4 +8,6 @@ } else { LIBS += -l@QMAKE_QWK_WIDGETS_NAME_RELEASE@ } + + @QMAKE_QWK_WIDGETS_STATIC_MACRO@ } \ No newline at end of file -- Gitblit v1.9.1