File 0001-Find-the-local-gmic-library.patch of Package gmic

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Find-the-local-gmic-library.patch of Package gmic (Revision 899ede06d571e0a85a8d230d2e3ff9bd)

Currently displaying revision 899ede06d571e0a85a8d230d2e3ff9bd , Show latest

From 7c185a08bd2f37c1831542651db3b048ba231ae6 Mon Sep 17 00:00:00 2001
From: Christophe Marin <christophe@krop.fr>
Date: Mon, 17 Apr 2023 16:07:00 +0200
Subject: [PATCH] Find the local gmic library

GMic's working build system was replaced by a Makefile for unknown reasons

To keep using CMake in gmic-qt, we need to find the locally built gmic library.
---
 gmic-qt/CMakeLists.txt | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gmic-qt/CMakeLists.txt b/gmic-qt/CMakeLists.txt
index 0641f4c..17d1535 100644
--- a/gmic-qt/CMakeLists.txt
+++ b/gmic-qt/CMakeLists.txt
@@ -149,7 +149,13 @@ endif()
 # Gmic
 #
 if (ENABLE_SYSTEM_GMIC)
-  find_package(Gmic REQUIRED CONFIG)
+  find_library(GMIC_LIBRARY gmic PATHS ${CMAKE_SOURCE_DIR}/../src)
+  find_path(GMIC_INCLUDE_DIR gmic.h PATHS ${CMAKE_SOURCE_DIR}/../src)
+  add_library(GMic::GMic UNKNOWN IMPORTED)
+  set_target_properties(GMic::GMic PROPERTIES
+    IMPORTED_LOCATION "${GMIC_LIBRARY}"
+    INTERFACE_INCLUDE_DIRECTORIES "${GMIC_INCLUDE_DIR}"
+  )
 endif (ENABLE_SYSTEM_GMIC)
 
 #
@@ -610,10 +616,10 @@ if(ENABLE_DYNAMIC_LINKING)
       ${gmic_qt_LIBRARIES}
       libgmicstatic
     )
-  elseif(TARGET libgmic)
+  elseif(TARGET GMic::GMic)
     set(gmic_qt_LIBRARIES
       ${gmic_qt_LIBRARIES}
-      libgmic
+      GMic::GMic
     )
   elseif(GMIC_LIB_PATH)
     set(gmic_qt_LIBRARIES
@@ -645,9 +651,6 @@ if(ENABLE_DYNAMIC_LINKING)
         ${CURL_LIBRARIES}
         ${EXTRA_LIBRARIES})
     endif()
-  else()
-    # Inject the G'MIC CImg plugin.
-    include_directories(../src)
   endif()
 else(ENABLE_DYNAMIC_LINKING)
   set(gmic_qt_SRCS
-- 
2.45.2

Places

File 0001-Find-the-local-gmic-library.patch of Package gmic (Revision 899ede06d571e0a85a8d230d2e3ff9bd)

Places