From: Uwe Hermann <redacted>
Date: Fri, 24 Jun 2016 21:17:51 +0000 (+0200)
Subject: Revert "cmake: use pkg-config ldflags directly instead of spliting libs and dirs"
X-Git-Tag: pulseview-0.4.0~288
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=cddf172d4b96a5bf6e89bd27d50545f4be50a43d;p=pulseview.git

Revert "cmake: use pkg-config ldflags directly instead of spliting libs and dirs"

This reverts commit bb4dede4c8bd711628566d3eb2136442f7205a41.

The -Wl,--whole-archive in libsigrok that lead to this change no longer
exists, so this change can be reverted (since it also causes issues with
"make test").

This fixes bug #808.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44f810e3..49c35cae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -440,13 +440,15 @@ set(PULSEVIEW_LINK_LIBS
 )
 
 if(STATIC_PKGDEPS_LIBS)
-	list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LDFLAGS})
+	link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS})
+	list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES})
 if(WIN32)
 	# Workaround for a MinGW linking issue.
 	list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2")
 endif()
 else()
-	list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LDFLAGS})
+	link_directories(${PKGDEPS_LIBRARY_DIRS})
+	list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})
 endif()
 
 if(WIN32)