X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=9dac69f2b08155200bf9bd49bcd78a99c74f9a08;hb=bb4dede4c8bd711628566d3eb2136442f7205a41;hp=55274e8cb34c7b7555edc7ffecb03e33d2b9c32f;hpb=4a9e84cac4399aa26f491ade61a0226c37e8ed43;p=pulseview.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 55274e8..9dac69f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -244,6 +244,7 @@ set(pulseview_HEADERS pv/prop/property.hpp pv/prop/string.hpp pv/toolbars/mainbar.hpp + pv/view/analogsignal.hpp pv/view/cursor.hpp pv/view/flag.hpp pv/view/header.hpp @@ -389,15 +390,13 @@ set(PULSEVIEW_LINK_LIBS ) if(STATIC_PKGDEPS_LIBS) - link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS}) - list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES}) + list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LDFLAGS}) if(WIN32) # Workaround for a MinGW linking issue. list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") endif() else() - link_directories(${PKGDEPS_LIBRARY_DIRS}) - list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES}) + list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LDFLAGS}) endif() if(WIN32)