option(DISABLE_WERROR "Build without -Werror" FALSE)
option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
-option(ENABLE_DECODE "Build with libsigrokdecode" FALSE)
+option(ENABLE_DECODE "Build with libsigrokdecode" TRUE)
option(ENABLE_COTIRE "Enable cotire" FALSE)
option(ENABLE_TESTS "Enable unit tests" FALSE)
option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE)
# 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()
#= Dependencies
#-------------------------------------------------------------------------------
-list(APPEND PKGDEPS libsigrok>=0.2.0)
+list(APPEND PKGDEPS libsigrok>=0.3.0)
if(ENABLE_DECODE)
- list(APPEND PKGDEPS libsigrokdecode>=0.2.0)
+ list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
endif()
find_package(PkgConfig)
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)
+find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED)
-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 system thread_win32 REQUIRED)
-else()
- find_package(Boost 1.42 COMPONENTS system thread REQUIRED)
-endif()
+#===============================================================================
+#= System Introspection
+#-------------------------------------------------------------------------------
+
+include(memaccess)
+memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS)
#===============================================================================
#= Config Header
set(PV_DESCRIPTION "A GUI for sigrok")
set(PV_VERSION_MAJOR 0)
-set(PV_VERSION_MINOR 1)
+set(PV_VERSION_MINOR 2)
set(PV_VERSION_MICRO 0)
set(PV_VERSION_STRING
${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}
set(pulseview_SOURCES
main.cpp
pv/devicemanager.cpp
- pv/devinst.cpp
pv/mainwindow.cpp
pv/sigsession.cpp
pv/storesession.cpp
+ pv/util.cpp
pv/data/analog.cpp
pv/data/analogsnapshot.cpp
pv/data/logic.cpp
pv/data/logicsnapshot.cpp
pv/data/signaldata.cpp
pv/data/snapshot.cpp
+ pv/device/device.cpp
+ pv/device/file.cpp
+ pv/device/devinst.cpp
+ pv/device/inputfile.cpp
+ pv/device/sessionfile.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
pv/dialogs/storeprogress.cpp
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
pv/mainwindow.h
pv/sigsession.h
pv/storesession.h
+ pv/device/devinst.h
pv/dialogs/about.h
pv/dialogs/connect.h
pv/dialogs/storeprogress.h
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
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)
set(PULSEVIEW_LINK_LIBS
${Boost_LIBRARIES}
- ${CMAKE_THREAD_LIBS_INIT}
${QT_LIBRARIES}
)