From 81a3d4fa9477ea7681b9c8e6ddd87b5f5dc996c9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Tue, 9 Jul 2019 18:36:28 +0200
Subject: [PATCH] Don't skip entire use_pkg_config_module if target exists

Otherwise the same library can not be added to another library
variable.
---
 cmake/modules/3rdParty.cmake | 40 +++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/cmake/modules/3rdParty.cmake b/cmake/modules/3rdParty.cmake
index f3359ad..8576c22 100644
--- a/cmake/modules/3rdParty.cmake
+++ b/cmake/modules/3rdParty.cmake
@@ -235,29 +235,27 @@ function (use_pkg_config_module)
         endif ()
     endif ()
 
-    # skip if target has already been added
-    if (TARGET "${ARGS_TARGET_NAME}")
-        return()
-    endif ()
+    # add target only if it has not already been added; otherwise just add the existing target to the library variable
+    if (NOT TARGET "${ARGS_TARGET_NAME}")
+        find_package(PkgConfig)
+        pkg_check_modules(PKG_CHECK_MODULES_RESULT ${ARGS_PKG_CHECK_MODULES} ${ARGS_PKG_CONFIG_MODULES})
 
-    find_package(PkgConfig)
-    pkg_check_modules(PKG_CHECK_MODULES_RESULT ${ARGS_PKG_CHECK_MODULES} ${ARGS_PKG_CONFIG_MODULES})
-
-    # create interface library
-    add_library(${ARGS_TARGET_NAME} INTERFACE IMPORTED)
-    if (PKG_CONFIG_USE_STATIC_LIBS)
-        set(PKG_CONFIG_CHECK_SUFFIX "_STATIC")
-    else ()
-        set(PKG_CONFIG_CHECK_SUFFIX "")
+        # create interface library
+        add_library(${ARGS_TARGET_NAME} INTERFACE IMPORTED)
+        if (PKG_CONFIG_USE_STATIC_LIBS)
+            set(PKG_CONFIG_CHECK_SUFFIX "_STATIC")
+        else ()
+            set(PKG_CONFIG_CHECK_SUFFIX "")
+        endif ()
+        set_property(TARGET ${ARGS_TARGET_NAME}
+                     PROPERTY INTERFACE_LINK_LIBRARIES "${PKG_CHECK_MODULES_RESULT${PKG_CONFIG_CHECK_SUFFIX}_LINK_LIBRARIES}")
+        set_property(TARGET ${ARGS_TARGET_NAME}
+                     PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${PKG_CHECK_MODULES_RESULT${PKG_CONFIG_CHECK_SUFFIX}_INCLUDE_DIRS}")
+        set_property(TARGET ${ARGS_TARGET_NAME}
+                     PROPERTY INTERFACE_COMPILE_OPTIONS "${PKG_CHECK_MODULES_RESULT${PKG_CONFIG_CHECK_SUFFIX}_CFLAGS_OTHER}")
+        set_property(TARGET ${ARGS_TARGET_NAME}
+                     PROPERTY INTERFACE_LINK_OPTIONS "${PKG_CHECK_MODULES_RESULT${PKG_CONFIG_CHECK_SUFFIX}_LDFLAGS_OTHER}")
     endif ()
-    set_property(TARGET ${ARGS_TARGET_NAME}
-                 PROPERTY INTERFACE_LINK_LIBRARIES "${PKG_CHECK_MODULES_RESULT${PKG_CONFIG_CHECK_SUFFIX}_LINK_LIBRARIES}")
-    set_property(TARGET ${ARGS_TARGET_NAME}
-                 PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${PKG_CHECK_MODULES_RESULT${PKG_CONFIG_CHECK_SUFFIX}_INCLUDE_DIRS}")
-    set_property(TARGET ${ARGS_TARGET_NAME}
-                 PROPERTY INTERFACE_COMPILE_OPTIONS "${PKG_CHECK_MODULES_RESULT${PKG_CONFIG_CHECK_SUFFIX}_CFLAGS_OTHER}")
-    set_property(TARGET ${ARGS_TARGET_NAME}
-                 PROPERTY INTERFACE_LINK_OPTIONS "${PKG_CHECK_MODULES_RESULT${PKG_CONFIG_CHECK_SUFFIX}_LDFLAGS_OTHER}")
 
     set("${ARGS_PKG_CONFIG_MODULES_VARIABLE}" "${${ARGS_PKG_CONFIG_MODULES_VARIABLE}};${ARGS_TARGET_NAME}" PARENT_SCOPE)
     set("${ARGS_LIBRARIES_VARIABLE}" "${${ARGS_LIBRARIES_VARIABLE}};${ARGS_TARGET_NAME}" PARENT_SCOPE)