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)
+option(FORCE_QT4 "Force use of Qt4 even if Qt5 is available" FALSE)
if(WIN32)
# On Windows/MinGW we need to statically link to libraries.
# 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)
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(FORCE_QT4)
+ set(Qt5Core_FOUND FALSE)
+else()
+ find_package(Qt5Core QUIET)
+endif()
-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)
+if(Qt5Core_FOUND)
+ message("-- Using Qt5")
+ find_package(Qt5Widgets REQUIRED)
+ find_package(Qt5Gui REQUIRED)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+ set(QT_INCLUDE_DIRS ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS})
+ set(QT_LIBRARIES Qt5::Gui Qt5::Widgets)
+ add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
else()
- find_package(Boost 1.42 COMPONENTS system thread REQUIRED)
+ find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
+ find_package(Qt4 REQUIRED)
endif()
+find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED)
+
+#===============================================================================
+#= 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}
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
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
list(APPEND pulseview_SOURCES pulseviewico.rc)
endif()
-qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
-qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
-qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
-
-include(${QT_USE_FILE})
+if(Qt5Core_FOUND)
+ qt5_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
+ qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
+ qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
+else()
+ qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
+ qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
+ qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
+ include(${QT_USE_FILE})
+endif()
#===============================================================================
#= Global Definitions
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)
add_definitions(-Werror)
endif()
+if(ENABLE_SIGNALS)
+ add_definitions(-DENABLE_SIGNALS)
+endif()
+
#===============================================================================
#= Global Include Directories
#-------------------------------------------------------------------------------
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${Boost_INCLUDE_DIRS}
+ ${QT_INCLUDE_DIRS}
)
if(STATIC_PKGDEPS_LIBS)
set(PULSEVIEW_LINK_LIBS
${Boost_LIBRARIES}
- ${CMAKE_THREAD_LIBS_INIT}
${QT_LIBRARIES}
)
projects / pulseview.git / blobdiff