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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 77b0137..9dac69f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,6 @@
 
 cmake_minimum_required(VERSION 2.8.6)
 
-include(FindPkgConfig)
 include(GNUInstallDirs)
 
 project(pulseview)
@@ -99,9 +98,9 @@ else()
 endif()
 
 if(ENABLE_TESTS)
-	find_package(Boost 1.48 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
+	find_package(Boost 1.53 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
 else()
-	find_package(Boost 1.48 COMPONENTS filesystem system thread REQUIRED)
+	find_package(Boost 1.53 COMPONENTS filesystem system thread REQUIRED)
 endif()
 
 # Find the platform's thread library (needed for C++11 threads).
@@ -121,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)
 
@@ -206,6 +205,7 @@ set(pulseview_SOURCES
 	pv/view/tracepalette.cpp
 	pv/view/tracetreeitem.cpp
 	pv/view/tracetreeitemowner.cpp
+	pv/view/triggermarker.cpp
 	pv/view/view.cpp
 	pv/view/viewitem.cpp
 	pv/view/viewitemowner.cpp
@@ -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
@@ -258,6 +259,7 @@ set(pulseview_HEADERS
 	pv/view/trace.hpp
 	pv/view/tracegroup.hpp
 	pv/view/tracetreeitem.hpp
+	pv/view/triggermarker.hpp
 	pv/view/view.hpp
 	pv/view/viewitem.hpp
 	pv/view/viewport.hpp
@@ -328,7 +330,7 @@ if(Qt5Core_FOUND)
 	qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
 	qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
 else()
-	# Workaroud for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.
+	# Workaround for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.
 	# https://bugreports.qt.io/browse/QTBUG-22829
 	qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}
 		OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
@@ -388,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)