X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=a6c0445b53afb457edfb724de8bdbc3a06dc746e;hp=50dde49032ca2ff898757f847abc465f3bc575cf;hb=4707a23dc7b76258f95d9522fbb6f4c7fd5cc558;hpb=744905d4ec6a05b53c17efb393a0ef907d95ebe2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50dde490..a6c0445b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,10 +43,6 @@ if(WIN32)
 	# This option is user configurable, but enable it by default on win32.
 	set(STATIC_PKGDEPS_LIBS TRUE)
 
-	# For boost-thread we need two additional settings on win32:
-	set(Boost_USE_STATIC_LIBS ON)
-	add_definitions(-DBOOST_THREAD_USE_LIB)
-
 	# Windows does not support UNIX signals.
 	set(ENABLE_SIGNALS FALSE)
 endif()
@@ -73,17 +69,7 @@ pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
 find_package(Qt4 REQUIRED)
 
-# Find the platform's thread library (needed for boost-thread).
-# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
-find_package(Threads)
-
-if(WIN32)
-	# On Windows/MinGW we need to use 'thread_win32' instead of 'thread'.
-	# The library is named libboost_thread_win32* (not libboost_thread*).
-	find_package(Boost 1.42 COMPONENTS filesystem system thread_win32 REQUIRED)
-else()
-	find_package(Boost 1.42 COMPONENTS filesystem system thread REQUIRED)
-endif()
+find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED)
 
 #===============================================================================
 #= System Introspection
@@ -121,6 +107,7 @@ set(pulseview_SOURCES
 	pv/mainwindow.cpp
 	pv/sigsession.cpp
 	pv/storesession.cpp
+	pv/util.cpp
 	pv/data/analog.cpp
 	pv/data/analogsnapshot.cpp
 	pv/data/logic.cpp
@@ -148,6 +135,7 @@ set(pulseview_SOURCES
 	pv/toolbars/samplingbar.cpp
 	pv/view/analogsignal.cpp
 	pv/view/cursor.cpp
+	pv/view/cursorheader.cpp
 	pv/view/cursorpair.cpp
 	pv/view/header.cpp
 	pv/view/marginwidget.cpp
@@ -187,6 +175,7 @@ set(pulseview_HEADERS
 	pv/prop/string.h
 	pv/toolbars/samplingbar.h
 	pv/view/cursor.h
+	pv/view/cursorheader.h
 	pv/view/header.h
 	pv/view/logicsignal.h
 	pv/view/marginwidget.h
@@ -259,6 +248,7 @@ include(${QT_USE_FILE})
 add_definitions(${QT_DEFINITIONS})
 add_definitions(-D__STDC_LIMIT_MACROS)
 add_definitions(-Wall -Wextra)
+add_definitions(-std=c++11)
 
 if(ENABLE_DECODE)
 	add_definitions(-DENABLE_DECODE)
@@ -292,7 +282,6 @@ link_directories(${Boost_LIBRARY_DIRS})
 
 set(PULSEVIEW_LINK_LIBS
 	${Boost_LIBRARIES}
-	${CMAKE_THREAD_LIBS_INIT}
 	${QT_LIBRARIES}
 )