File Fix-searching-for-openjpeg.patch of Package calligra4

From b24654a32ace24c89394fe844d96fc1a68d599d4 Mon Sep 17 00:00:00 2001
From: Boudewijn Rempt <boud@valdyas.org>
Date: Fri, 27 Sep 2019 16:02:11 +0200
Subject: [PATCH] Fix searching for openjpeg

---
 CMakeLists.txt                   |  8 +++-
 cmake/modules/FindOpenJPEG.cmake | 77 +++++++++++---------------------
 2 files changed, 31 insertions(+), 54 deletions(-)

diff --git a/cmake/modules/FindOpenJPEG.cmake b/cmake/modules/FindOpenJPEG.cmake
index ae859572e9..b5c2ecaf54 100644
--- a/cmake/modules/FindOpenJPEG.cmake
+++ b/cmake/modules/FindOpenJPEG.cmake
@@ -1,56 +1,30 @@
-# -*- cmake -*-
-
-# - Find OpenJPEG
-# Find the OpenJPEG includes and library
-# This module defines
-#  OPENJPEG_INCLUDE_DIR, where to find openjpeg.h, etc.
-#  OPENJPEG_LIBRARIES, the libraries needed to use OpenJPEG.
-#  OPENJPEG_FOUND, If false, do not try to use OpenJPEG.
-# also defined, but not for general use are
-#  OPENJPEG_LIBRARY, where to find the OpenJPEG library.
-
-find_path(OPENJPEG_INCLUDE_DIR openjpeg.h
-PATHS
-    /usr/local/include/openjpeg
-    /usr/local/include
-    /usr/include/openjpeg
-    /usr/include/openjpeg-1.5
-    /usr/include
-PATH_SUFFIXES
-    openjpeg-1.5
-    openjpeg
+# - Try to find OpenJPEG
+# Once done, this will define
+#
+#  OpenJPEG_FOUND - system has OpenJPEG
+#  OpenJPEG_INCLUDE_DIRS - the OpenJPEG include directories
+#  OpenJPEG_LIBRARIES - link these to use OpenJPEG
+
+include(LibFindMacros)
+
+# Use pkg-config to get hints about paths
+libfind_pkg_check_modules(OpenJPEG_PKGCONF libopenjp2)
+
+# Include dir
+find_path(OpenJPEG_INCLUDE_DIR
+  NAMES openjpeg.h
+  HINTS ${OpenJPEG_PKGCONF_INCLUDE_DIRS}
 )
 
-set(OPENJPEG_NAMES ${OPENJPEG_NAMES} openjpeg)
-find_library(OPENJPEG_LIBRARY
-  NAMES ${OPENJPEG_NAMES}
-  PATHS
-      /usr/lib /usr/local/lib
+# Finally the library itself
+find_library(OpenJPEG_LIBRARY
+  NAMES openjp2
+  HINTS ${OpenJPEG_PKGCONF_LIBRARY_DIRS}
 )
 
-if (OPENJPEG_LIBRARY AND OPENJPEG_INCLUDE_DIR)
-    set(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY})
-    set(OPENJPEG_FOUND "YES")
-else ()
-  set(OPENJPEG_FOUND "NO")
-endif ()
-
-
-if (OPENJPEG_FOUND)
-   if (NOT OPENJPEG_FIND_QUIETLY)
-      message(STATUS "Found OpenJPEG: ${OPENJPEG_LIBRARIES}")
-   endif ()
-else ()
-   if (OPENJPEG_FIND_REQUIRED)
-      message(FATAL_ERROR "Could not find OpenJPEG library")
-   endif ()
-endif ()
-
-# Deprecated declarations.
-set (NATIVE_OPENJPEG_INCLUDE_PATH ${OPENJPEG_INCLUDE_DIR} )
-get_filename_component (NATIVE_OPENJPEG_LIB_PATH ${OPENJPEG_LIBRARY} PATH)
-
-mark_as_advanced(
-  OPENJPEG_LIBRARY
-  OPENJPEG_INCLUDE_DIR
-  )
+# Set the include dir variables and the libraries and let libfind_process do the rest.
+# NOTE: Singular variables for this library, plural for libraries this lib depends on.
+set(OpenJPEG_PROCESS_INCLUDES OpenJPEG_INCLUDE_DIR)
+set(OpenJPEG_PROCESS_LIBS OpenJPEG_LIBRARY)
+libfind_process(OpenJPEG)
+set(OPENJPEG_FOUND ${OpenJPEG_FOUND} PARENT_SCOPE)
+message("OpenJPEG_FOUND: ${OpenJPEG_FOUND})
-- 
GitLab