[Pkg-voip-commits] [bctoolbox] 28/60: Fix BcToolboxConfig.cmake.in.

[Bernhard Schmidt]

This is an automated email from the git hooks/post-receive script.

berni pushed a commit to branch debian/sid
in repository bctoolbox.

commit f4da79101a14a3e34b22b936f326393be6e87b0d
Author: Ghislain MARY <ghislain.mary at belledonne-communications.com>
Date:   Fri Apr 21 15:03:27 2017 +0200

    Fix BcToolboxConfig.cmake.in.
---
 cmake/BcToolboxConfig.cmake.in | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/cmake/BcToolboxConfig.cmake.in b/cmake/BcToolboxConfig.cmake.in
index 29526dd..cee0aa8 100644
--- a/cmake/BcToolboxConfig.cmake.in
+++ b/cmake/BcToolboxConfig.cmake.in
@@ -34,8 +34,6 @@
 #  BCTOOLBOX_${comp}_INCLUDE_DIRS - the bctoolbox "comp" component include directory
 #  BCTOOLBOX_${comp}_LIBRARIES - The libraries needed to use bctoolbox "comp" component
 
-include("${CMAKE_CURRENT_LIST_DIR}/BcToolboxCMakeUtils.cmake")
-
 if(NOT LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
 	include("${CMAKE_CURRENT_LIST_DIR}/BcToolboxTargets.cmake")
 endif()
@@ -58,7 +56,17 @@ foreach(comp ${BcToolbox_FIND_COMPONENTS})
 		set(BCTOOLBOX_${uppercomp}_LIBRARIES ${targetname})
 	else()
 		set(targetname ${targetname}-static)
-		bc_set_libraries_from_static_target(BCTOOLBOX_${uppercomp}_LIBRARIES ${targetname})
+		if(TARGET ${targetname})
+			if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS)
+				set(BCTOOLBOX_${uppercomp}_LIBRARIES ${targetname})
+			else()
+				get_target_property(BCTOOLBOX_${uppercomp}_LIBRARIES ${targetname} LOCATION)
+			endif()
+			get_target_property(BCTOOLBOX_${uppercomp}_LINK_LIBRARIES ${targetname} INTERFACE_LINK_LIBRARIES)
+			if(BCTOOLBOX_${uppercomp}_LINK_LIBRARIES)
+				list(APPEND BCTOOLBOX_${uppercomp}_LIBRARIES ${BCTOOLBOX_${uppercomp}_LINK_LIBRARIES})
+			endif()
+		endif()
 	endif()
 	if(TARGET ${targetname})
 		get_target_property(BCTOOLBOX_${uppercomp}_INCLUDE_DIRS ${targetname} INTERFACE_INCLUDE_DIRECTORIES)
@@ -82,3 +90,5 @@ if(BCTOOLBOX_INCLUDE_DIRS)
 	list(REMOVE_DUPLICATES BCTOOLBOX_INCLUDE_DIRS)
 endif()
 
+include("${CMAKE_CURRENT_LIST_DIR}/BcToolboxCMakeUtils.cmake")
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/bctoolbox.git