From 381cba2612e37365efa986d00f7b1c9f3aa710b5 Mon Sep 17 00:00:00 2001
From: Linus Dierheimer <Linus@Dierheimer.de>
Date: Mon, 19 Sep 2022 18:30:00 +0200
Subject: [PATCH] Refactor ff_lib_enable

---
 CMakeLists.txt         | 23 ++++++++++++++---------
 src/logo/image/image.h |  3 ---
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c39d77e8e..546e0ee8f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -300,17 +300,22 @@ function(ff_lib_enable VARNAME)
         return()
     endif()
 
-    foreach(LIBNAME ${ARGN})
-        pkg_check_modules(${VARNAME} ${LIBNAME})
-        if(${VARNAME}_FOUND)
-            target_compile_definitions(libfastfetch PRIVATE FF_HAVE_${VARNAME}=1)
-            target_include_directories(libfastfetch PRIVATE ${${VARNAME}_INCLUDE_DIRS})
-            target_link_directories(libfastfetch PRIVATE ${${VARNAME}_LIBRARY_DIRS})
-            return()
+    pkg_search_module(${VARNAME} ${ARGN})
+    if(NOT ${VARNAME}_FOUND)
+        message(WARNING "Package ${ARGV1} not found, building without support.")
+        return()
+    endif()
+
+    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_${VARNAME}=1)
+    target_include_directories(libfastfetch PRIVATE ${${VARNAME}_INCLUDE_DIRS})
+    target_link_directories(libfastfetch PRIVATE ${${VARNAME}_LIBRARY_DIRS})
+
+    foreach(FLAG ${${VARNAME}_CFLAGS_OTHER})
+        if(FLAG MATCHES "-D.*")
+            string(SUBSTRING ${FLAG} 2 -1 FLAG)
+            target_compile_definitions(libfastfetch PRIVATE ${FLAG})
         endif()
     endforeach()
-
-    message(WARNING "Package ${ARGV1} not found, building without support.")
 endfunction()
 
 ff_lib_enable(LIBPCI libpci)
diff --git a/src/logo/image/image.h b/src/logo/image/image.h
index 8735061a6..67fbbcdc1 100644
--- a/src/logo/image/image.h
+++ b/src/logo/image/image.h
@@ -7,9 +7,6 @@
 
 #if defined(FF_HAVE_IMAGEMAGICK7) || defined(FF_HAVE_IMAGEMAGICK6)
 
-#define MAGICKCORE_HDRI_ENABLE 1
-#define MAGICKCORE_QUANTUM_DEPTH 16
-
 typedef enum FFLogoImageResult
 {
     FF_LOGO_IMAGE_RESULT_SUCCESS,    //Logo printed