Use more standard cmake functionality to search for discount

Instead of rolling our own, that's harder to understand and buggy anyway

BUGS: 431311

autotests/CMakeLists.txt

@@ -125,11 +125,11 @@ ecm_add_test(signatureformtest.cpp
     LINK_LIBRARIES Qt5::Test okularcore
 )
 
-find_package(Discount "2")
+find_package(Discount)
 
-if(discount_FOUND)
+if(Discount_FOUND)
     ecm_add_test(markdowntest.cpp ../generators/markdown/converter.cpp
         TEST_NAME "markdowntest"
-        LINK_LIBRARIES Qt5::Test okularcore KF5::I18n discount::Lib
+        LINK_LIBRARIES Qt5::Test okularcore KF5::I18n PkgConfig::Discount
     )
 endif()

cmake/modules/FindDiscount.cmake

@@ -2,9 +2,8 @@
 # Find the discount markdown library.
 #
 # This module defines
-#  discount_FOUND - whether the discount library was found
+#  Discount_FOUND - whether the discount library was found
-#  discount_LIBRARIES - the discount library
+#  PkgConfig::Discount - the discount target to link to
-#  discount_INCLUDE_DIR - the include path of the discount library
 
 # Copyright (c) 2017, Julian Wolff, <wolff@julianwolff.de>
 # Copyright (c) 2018, Sune Vuorela, <sune@kde.org>
@@ -12,30 +11,10 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
+include(FindPackageHandleStandardArgs)
 
-if (discount_INCLUDE_DIR AND discount_LIBRARIES)
+find_package(PkgConfig REQUIRED)
 
-  # Already in cache
+pkg_check_modules(Discount IMPORTED_TARGET "libmarkdown")
-  set (discount_FOUND TRUE)
 
-else (discount_INCLUDE_DIR AND discount_LIBRARIES)
+find_package_handle_standard_args(Discount DEFAULT_MSG Discount_LIBRARIES)
-
-  find_library (discount_LIBRARIES
-    NAMES markdown libmarkdown
-  )
-
-  find_path (discount_INCLUDE_DIR
-    NAMES mkdio.h
-  )
-
-  include (FindPackageHandleStandardArgs)
-  find_package_handle_standard_args (discount DEFAULT_MSG discount_LIBRARIES discount_INCLUDE_DIR)
-
-endif (discount_INCLUDE_DIR AND discount_LIBRARIES)
-
-mark_as_advanced(discount_INCLUDE_DIR discount_LIBRARIES)
-
-if (discount_FOUND)
-   add_library(discount::Lib UNKNOWN IMPORTED)
-   set_target_properties(discount::Lib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES ${discount_INCLUDE_DIR} IMPORTED_LOCATION ${discount_LIBRARIES})
-endif()

generators/CMakeLists.txt

@@ -92,8 +92,8 @@ set_package_properties("libqmobipocket" PROPERTIES
         TYPE RECOMMENDED
         PURPOSE "Support for Mobipocket documents in Okular.")
         
-find_package(Discount "2")
+find_package(Discount)
-set_package_properties("discount" PROPERTIES
+set_package_properties("Discount" PROPERTIES
         DESCRIPTION "A library that gives you formatting functions suitable for marking down entire documents or lines of text"
         URL "https://www.pell.portland.or.us/~orc/Code/discount/"
         TYPE RECOMMENDED
@@ -149,6 +149,6 @@ if(QMobipocket_FOUND)
   add_subdirectory(mobipocket)
 endif()
 
-if(discount_FOUND)
+if(Discount_FOUND)
   add_subdirectory(markdown)
 endif()

generators/markdown/CMakeLists.txt

@@ -16,7 +16,7 @@ set(okularGenerator_md_PART_SRCS
 
 okular_add_generator(okularGenerator_md ${okularGenerator_md_PART_SRCS})
 
-target_link_libraries(okularGenerator_md PRIVATE okularcore KF5::I18n KF5::KIOCore discount::Lib)
+target_link_libraries(okularGenerator_md PRIVATE okularcore KF5::I18n KF5::KIOCore PkgConfig::Discount)
 
 ########### install files ###############
 install( FILES okularMd.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )