[education/minuet/release/26.08] /: Use the same condition for finding KF6IconThemes when linking
Heiko Becker <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 853d4cea927b617eef00a16762e802a1161de0d0 by Heiko Becker.
Committed on 23/07/2026 at 10:43.
Pushed by heikobecker into branch 'release/26.08'.
Use the same condition for finding KF6IconThemes when linking
I unfortunately broke this in 9aef20d, being confused about Apple's OSes
and seeing the if(IOS) branch. But it actually turns out that
src/app/CMakeLists.txt does
if(APPLE AND NOT (CMAKE_SYSTEM_NAME STREQUAL "iOS"))
target_link_libraries(minuet PRIVATE KF6::IconThemes)
...
and src/app/main.cpp:
#if defined(Q_OS_MACOS)
#include <KIconTheme>
#endif
So match this usage in the find_package call.
(cherry picked from commit 0876d7f8ec7118cf092a51be433a15d03da0f823)
M +4 -3 CMakeLists.txt
https://invent.kde.org/education/minuet/-/commit/853d4cea927b617eef00a16762e802a1161de0d0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f48e9bd..00c4c51 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,14 +189,15 @@ if(NOT MINUET_MOBILE_PLATFORM)
KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS Crash DocTools
QQC2DesktopStyle
)
+ if(APPLE)
+ find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS IconThemes)
+ endif()
ecm_find_qmlmodule(org.kde.desktop REQUIRED)
else()
find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS ColorScheme)
- if(IOS)
- find_package(KF6 ${KF_MIN_VERSION} REQUIRED COMPONENTS IconThemes)
- endif()
endif()
+
include_directories(${minuet_SOURCE_DIR}/src/ ${minuet_BINARY_DIR}/src/)
add_subdirectory(src)