CursorHeader: Make the size dependend on the used font.

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b8f9fa8317fdb8128cd50772d4ab3dc3937d191..a6c0445b53afb457edfb724de8bdbc3a06dc746e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ project(pulseview)
 
 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)
@@ -43,22 +43,24 @@ 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()
 
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+      "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+      FORCE)
+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)
@@ -67,17 +69,14 @@ 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)
+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
@@ -87,7 +86,7 @@ set(PV_TITLE PulseView)
 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}
@@ -107,14 +106,22 @@ set(pulseview_SOURCES
        pv/devicemanager.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/popups/deviceoptions.cpp
        pv/popups/probes.cpp
        pv/prop/bool.cpp
@@ -128,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
@@ -144,6 +152,7 @@ set(pulseview_SOURCES
        pv/widgets/colourpopup.cpp
        pv/widgets/popup.cpp
        pv/widgets/popuptoolbutton.cpp
+       pv/widgets/sweeptimingwidget.cpp
        pv/widgets/wellarray.cpp
 )
 
@@ -151,8 +160,11 @@ set(pulseview_SOURCES
 set(pulseview_HEADERS
        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/popups/probes.h
        pv/popups/deviceoptions.h
        pv/prop/bool.h
@@ -163,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
@@ -177,6 +190,7 @@ set(pulseview_HEADERS
        pv/widgets/colourpopup.h
        pv/widgets/popup.h
        pv/widgets/popuptoolbutton.h
+       pv/widgets/sweeptimingwidget.h
        pv/widgets/wellarray.h
 )
 
@@ -198,11 +212,12 @@ if(ENABLE_DECODE)
                pv/data/decoderstack.cpp
                pv/data/decode/annotation.cpp
                pv/data/decode/decoder.cpp
+               pv/data/decode/row.cpp
+               pv/data/decode/rowdata.cpp
                pv/prop/binding/decoderoptions.cpp
                pv/view/decodetrace.cpp
                pv/widgets/decodergroupbox.cpp
                pv/widgets/decodermenu.cpp
-               pv/widgets/wellarray.cpp
        )
 
        list(APPEND pulseview_HEADERS
@@ -233,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)
@@ -266,13 +282,16 @@ link_directories(${Boost_LIBRARY_DIRS})
 
 set(PULSEVIEW_LINK_LIBS
        ${Boost_LIBRARIES}
-       ${CMAKE_THREAD_LIBS_INIT}
        ${QT_LIBRARIES}
 )
 
 if(STATIC_PKGDEPS_LIBS)
        link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS})
        list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES})
+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})