From 117f2d84d1baf454f8eeef05c0779f7011be8102 Mon Sep 17 00:00:00 2001 From: Christophe Marin 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 9aa0568..7763df7 100644 --- a/gmic-qt/CMakeLists.txt +++ b/gmic-qt/CMakeLists.txt @@ -142,7 +142,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) # @@ -577,10 +583,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 @@ -612,9 +618,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.40.0