Refactor ff_lib_enable

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)

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