From 4363eba606ac40f383cd9c64cfce0c4725e49b5f Mon Sep 17 00:00:00 2001
From: Simon Wells <simon@air.local>
Date: Sun, 7 Oct 2018 09:29:34 +1300
Subject: [PATCH] Prefer LDFLAGS over LIBRARIES for pkgconfig

LDFLAGS include LIBRARIES, therefore remove duplicates
Replaced LIBRARIES with LDFLAGS for gtk and gtkspell so they work even if the libraries are not in a standard path
---
 CMakeScripts/DefineDependsandFlags.cmake | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 897aafb579..9f06174729 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -59,15 +59,9 @@ pkg_check_modules(INKSCAPE_DEP REQUIRED
 
 list(APPEND INKSCAPE_LIBS ${INKSCAPE_DEP_LDFLAGS})
 list(APPEND INKSCAPE_INCS_SYS ${INKSCAPE_DEP_INCLUDE_DIRS})
-list(APPEND INKSCAPE_LIBS ${INKSCAPE_DEP_LIBRARIES})
 
 add_definitions(${INKSCAPE_DEP_CFLAGS_OTHER})
 
-if(APPLE AND DEFINED ENV{CMAKE_PREFIX_PATH})
-    list(APPEND INKSCAPE_LIBS "-L$ENV{CMAKE_PREFIX_PATH}/lib")
-endif()
-
-
 if(WITH_JEMALLOC)
     find_package(JeMalloc)
     if (JEMALLOC_FOUND)
@@ -204,7 +198,6 @@ if(WITH_DBUS)
     if(DBUS_FOUND)
         list(APPEND INKSCAPE_LIBS ${DBUS_LDFLAGS})
         list(APPEND INKSCAPE_INCS_SYS ${DBUS_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/src/extension/dbus/)
-        list(APPEND INKSCAPE_LIBS ${DBUS_LIBRARIES})
         add_definitions(${DBUS_CFLAGS_OTHER})
     else()
         set(WITH_DBUS OFF)
@@ -240,7 +233,7 @@ pkg_check_modules(
     )
 list(APPEND INKSCAPE_CXX_FLAGS ${GTK3_CFLAGS_OTHER})
 list(APPEND INKSCAPE_INCS_SYS ${GTK3_INCLUDE_DIRS})
-list(APPEND INKSCAPE_LIBS ${GTK3_LIBRARIES})
+list(APPEND INKSCAPE_LIBS ${GTK3_LDFLAGS})
 
 pkg_check_modules(GDL_3_6 gdl-3.0>=3.6)
 if("${GDL_3_6_FOUND}")
@@ -252,7 +245,7 @@ pkg_check_modules(GTKSPELL3 gtkspell3-3.0)
 if("${GTKSPELL3_FOUND}")
     message(STATUS "Using GtkSpell 3")
     list(APPEND INKSCAPE_INCS_SYS ${GTKSPELL3_INCLUDE_DIRS})
-    list(APPEND INKSCAPE_LIBS ${GTKSPELL3_LIBRARIES})
+    list(APPEND INKSCAPE_LIBS ${GTKSPELL3_LDFLAGS})
     set(WITH_GTKSPELL ON)
 else()
     set(WITH_GTKSPELL OFF)
@@ -326,9 +319,7 @@ endif()
 if(MAGICK_FOUND)
     list(APPEND INKSCAPE_LIBS ${MAGICK_LDFLAGS})
     add_definitions(${MAGICK_CFLAGS_OTHER})
-
     list(APPEND INKSCAPE_INCS_SYS ${MAGICK_INCLUDE_DIRS})
-    list(APPEND INKSCAPE_LIBS ${MAGICK_LIBRARIES})
 
     set(WITH_MAGICK ON) # enable 'Extensions > Raster'
 endif()
@@ -353,7 +344,6 @@ endif(WITH_NLS)
 
 pkg_check_modules(SIGC++ REQUIRED sigc++-2.0 )
 list(APPEND INKSCAPE_LIBS ${SIGC++_LDFLAGS})
-
 list(APPEND INKSCAPE_CXX_FLAGS ${SIGC++_CFLAGS_OTHER})
 
 if(WITH_YAML)
-- 
GitLab