fix: set Qt definitions PUBLIC in chatterino-lib/-version (#6520)
This commit is contained in:
@@ -18,6 +18,7 @@
|
|||||||
- Dev: Merged emote element flags from different providers into two. (#6511)
|
- Dev: Merged emote element flags from different providers into two. (#6511)
|
||||||
- Dev: Removed unused method in `Emojis`. (#6517)
|
- Dev: Removed unused method in `Emojis`. (#6517)
|
||||||
- Dev: Refactored `Emotes` into `EmoteController`. (#6516)
|
- Dev: Refactored `Emotes` into `EmoteController`. (#6516)
|
||||||
|
- Dev: Added Qt keyword and warning flags project wide. (#6520)
|
||||||
- Def: Fixed compilation error in tests with Clang 21. (#6519)
|
- Def: Fixed compilation error in tests with Clang 21. (#6519)
|
||||||
|
|
||||||
## 2.5.4
|
## 2.5.4
|
||||||
|
|||||||
+10
-3
@@ -1,9 +1,8 @@
|
|||||||
set(LIBRARY_PROJECT "${PROJECT_NAME}-lib")
|
set(LIBRARY_PROJECT "${PROJECT_NAME}-lib")
|
||||||
set(VERSION_PROJECT "${LIBRARY_PROJECT}-version")
|
set(VERSION_PROJECT "${LIBRARY_PROJECT}-version")
|
||||||
set(EXECUTABLE_PROJECT "${PROJECT_NAME}")
|
set(EXECUTABLE_PROJECT "${PROJECT_NAME}")
|
||||||
add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x060403)
|
# used for QT_DISABLE_DEPRECATED_BEFORE/QT_WARN_DEPRECATED_UP_TO
|
||||||
add_compile_definitions(QT_WARN_DEPRECATED_UP_TO=0x060403)
|
set(CHATTERINO_MIN_QT_VERSION 0x060403)
|
||||||
add_compile_definitions(QT_NO_KEYWORDS)
|
|
||||||
|
|
||||||
# registers the native messageing host
|
# registers the native messageing host
|
||||||
option(CHATTERINO_DEBUG_NATIVE_MESSAGES "Debug native messages" OFF)
|
option(CHATTERINO_DEBUG_NATIVE_MESSAGES "Debug native messages" OFF)
|
||||||
@@ -1079,6 +1078,14 @@ target_compile_definitions(${LIBRARY_PROJECT} PUBLIC
|
|||||||
$<$<BOOL:${BUILD_TESTS}>:CHATTERINO_WITH_TESTS>
|
$<$<BOOL:${BUILD_TESTS}>:CHATTERINO_WITH_TESTS>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
set(_c2_qt_defs
|
||||||
|
QT_DISABLE_DEPRECATED_BEFORE=${CHATTERINO_MIN_QT_VERSION}
|
||||||
|
QT_WARN_DEPRECATED_UP_TO=${CHATTERINO_MIN_QT_VERSION}
|
||||||
|
QT_NO_KEYWORDS
|
||||||
|
)
|
||||||
|
target_compile_definitions(${VERSION_PROJECT} PUBLIC ${_c2_qt_defs})
|
||||||
|
target_compile_definitions(${LIBRARY_PROJECT} PUBLIC ${_c2_qt_defs})
|
||||||
|
|
||||||
if (USE_SYSTEM_QTKEYCHAIN)
|
if (USE_SYSTEM_QTKEYCHAIN)
|
||||||
target_compile_definitions(${LIBRARY_PROJECT} PUBLIC
|
target_compile_definitions(${LIBRARY_PROJECT} PUBLIC
|
||||||
CMAKE_BUILD
|
CMAKE_BUILD
|
||||||
|
|||||||
Reference in New Issue
Block a user