projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "cmake: use pkg-config ldflags directly instead of spliting libs and dirs"
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 44f810e3c5fec71a299a166ee546a705ceb22ef8..49c35cae15f6ab318f6d161b61c22d98e31be107 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-440,13
+440,15
@@
set(PULSEVIEW_LINK_LIBS
)
if(STATIC_PKGDEPS_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()
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)
endif()
if(WIN32)