[pim/kdepim-addons/release/26.08] /: Fix compilation of markdown plugin
Allen Winter <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 0baa24dfa76f261e736c3191e8a344bab69e6f78 by Allen Winter, on behalf of Antonio Rojas.
Committed on 19/07/2026 at 09:53.
Pushed by winterz into branch 'release/26.08'.
Fix compilation of markdown plugin
This has been missing since 76ba1af82fc0f58bc4388f6a11851e477c89c801, which made the lower-case discount_FOUND variable no longer be defined.
(cherry picked from commit 3420ab9037c523740eadfca1a13de0476bd549a3)
M +2 -2 CMakeLists.txt
M +2 -2 cmake/modules/FindDiscount.cmake
M +1 -1 kmail/editorconvertertextplugins/CMakeLists.txt
M +1 -1 plugins/messageviewer/bodypartformatter/CMakeLists.txt
https://invent.kde.org/pim/kdepim-addons/-/commit/0baa24dfa76f261e736c3191e8a344bab69e6f78
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34dd45b32..68b4b4ff8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -336,7 +336,7 @@ set(QTCREATOR_TEMPLATE_INSTALL_DIR
find_package(Discount "2" MODULE)
set_package_properties(
- "discount"
+ "Discount"
PROPERTIES
DESCRIPTION
"A library that gives you formatting functions suitable for marking down entire documents or lines of text"
@@ -348,7 +348,7 @@ set_package_properties(
"Generate Markdown file."
)
-if(discount_FOUND)
+if(Discount_FOUND)
if(DEFINED PC_LIBMARKDOWN_VERSION)
if(${PC_LIBMARKDOWN_VERSION} VERSION_GREATER "2.2.5")
set(DISCOUNT_HAS_HIGHLIGHTING_SUPPORT TRUE)
diff --git a/cmake/modules/FindDiscount.cmake b/cmake/modules/FindDiscount.cmake
index 6ddcbcd86..48fbaa5c5 100644
--- a/cmake/modules/FindDiscount.cmake
+++ b/cmake/modules/FindDiscount.cmake
@@ -14,7 +14,7 @@
if(discount_INCLUDE_DIRS AND discount_LIBRARIES)
# Already in cache
- set(discount_FOUND TRUE)
+ set(Discount_FOUND TRUE)
else()
if(NOT WIN32)
find_package(PkgConfig QUIET)
@@ -47,7 +47,7 @@ mark_as_advanced(
discount_INCLUDE_DIRS
discount_LIBRARIES
)
-if(discount_FOUND)
+if(Discount_FOUND)
add_library(discount::Lib UNKNOWN IMPORTED)
set_target_properties(
discount::Lib
diff --git a/kmail/editorconvertertextplugins/CMakeLists.txt b/kmail/editorconvertertextplugins/CMakeLists.txt
index 78ee33f8d..e7ae27f0f 100644
--- a/kmail/editorconvertertextplugins/CMakeLists.txt
+++ b/kmail/editorconvertertextplugins/CMakeLists.txt
@@ -2,6 +2,6 @@
# SPDX-License-Identifier: BSD-3-Clause
add_definitions(-DTRANSLATION_DOMAIN=\"kmail_editorconvertertext_plugins\")
-if(discount_FOUND)
+if(Discount_FOUND)
add_subdirectory(markdown)
endif()
diff --git a/plugins/messageviewer/bodypartformatter/CMakeLists.txt b/plugins/messageviewer/bodypartformatter/CMakeLists.txt
index 8421d3c46..7dda46bee 100644
--- a/plugins/messageviewer/bodypartformatter/CMakeLists.txt
+++ b/plugins/messageviewer/bodypartformatter/CMakeLists.txt
@@ -14,7 +14,7 @@ if(TARGET KPim6::Itinerary)
endif()
option(FORCE_DISCOUNT_LIB "Force using discount lib for markdown bodyformatter." TRUE)
-if(FORCE_DISCOUNT_LIB AND discount_FOUND)
+if(FORCE_DISCOUNT_LIB AND Discount_FOUND)
set(USE_DISCOUNT_LIB TRUE)
message(STATUS "build bodyparformatter mardown with discount support")
add_subdirectory(markdown)