X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=9dac69f2b08155200bf9bd49bcd78a99c74f9a08;hb=bb4dede4c8bd711628566d3eb2136442f7205a41;hp=e21ace688663d4f4327fd161903140f4071c6048;hpb=39ccf9c39ec5c1ddeb5ba62f77cc811a2598bf72;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e21ace6..9dac69f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,7 @@ memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS)
 
 set(PV_TITLE PulseView)
 set(PV_DESCRIPTION "A GUI for sigrok")
-set(PV_VERSION_STRING "0.3.0")
+set(PV_VERSION_STRING "0.4.0")
 
 include(GetGitRevisionDescription)
 
@@ -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)