X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=d210f92ae3cd351b8b87e5254319b00025165b62;hb=aa8da126bbe0cf68bb04bbbc6410bd5ff5980cc8;hp=03d856b7bf923407622b250ca792afef9a5bacd6;hpb=4e5a4405482a296ebb6014e627298ad156c78d55;p=pulseview.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 03d856b..d210f92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,78 +18,165 @@
## along with this program. If not, see .
##
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 2.8.12)
-include(FindPkgConfig)
include(GNUInstallDirs)
-set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
-include(cotire)
-
project(pulseview)
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
+
#===============================================================================
#= User Options
#-------------------------------------------------------------------------------
option(DISABLE_WERROR "Build without -Werror" FALSE)
option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
-option(ENABLE_TESTS "Enable unit tests" FALSE)
-option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
+option(ENABLE_DECODE "Build with libsigrokdecode" TRUE)
+option(ENABLE_TESTS "Enable unit tests" TRUE)
+option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" 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)
-
- # Windsws does not support UNIX signals
+ # 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 (None, Debug, Release, RelWithDebInfo, MinSizeRel)."
+ FORCE)
+endif()
+
#===============================================================================
#= Dependencies
#-------------------------------------------------------------------------------
-list(APPEND PKGDEPS
- libsigrok>=0.2.0
- libsigrokdecode>=0.2.0
-)
+list(APPEND PKGDEPS glib-2.0>=2.28.0)
+list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
+
+list(APPEND PKGDEPS libsigrokcxx>=0.6.0)
+
+if(ENABLE_DECODE)
+ list(APPEND PKGDEPS libsigrokdecode>=0.6.0)
+endif()
+
+if(ANDROID)
+ list(APPEND PKGDEPS libsigrokandroidutils>=0.1.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)
+set(CMAKE_AUTOMOC TRUE)
-# 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(Qt5 COMPONENTS Core Gui Widgets Svg REQUIRED)
if(WIN32)
-# On Windows/MinGW the 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)
+ # MXE workaround: Use pkg-config to find Qt5 libs.
+ # https://github.com/mxe/mxe/issues/1642
+ pkg_check_modules(QT5ALL REQUIRED Qt5Widgets Qt5Gui Qt5Svg)
+endif()
+
+set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Svg)
+
+set(BOOSTCOMPS filesystem serialization system)
+if(ENABLE_TESTS)
+ list(APPEND BOOSTCOMPS unit_test_framework)
+endif()
+find_package(Boost 1.55 COMPONENTS ${BOOSTCOMPS} REQUIRED)
+
+# Find the platform's thread library (needed for C++11 threads).
+# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
+find_package(Threads REQUIRED)
+
+# Check for explicit link against libatomic
+#
+# Depending on the toolchain, linking a program using atomic functions may need
+# "-latomic" explicitly passed to the linker
+#
+# This check first tests if atomics are available in the C-library, if not and
+# libatomic exists, then it runs the same test with -latomic added to the
+# linker flags.
+
+# Helper for checking for atomics
+function(check_working_cxx_atomics varname additional_lib)
+ include(CheckCXXSourceCompiles)
+ include(CMakePushCheckState)
+ cmake_push_check_state()
+ set(CMAKE_REQUIRED_FLAGS "-std=c++11")
+ set(CMAKE_REQUIRED_LIBRARIES "${additional_lib}")
+ set(CMAKE_REQUIRED_QUIET 1)
+ CHECK_CXX_SOURCE_COMPILES("
+#include
+std::atomic x;
+int main() {
+ return std::atomic_fetch_add_explicit(&x, 1, std::memory_order_seq_cst);
+}
+" ${varname})
+ cmake_pop_check_state()
+endfunction(check_working_cxx_atomics)
+
+# First check if atomics work without the library.
+# If not, check if the library exists, and atomics work with it.
+check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB "")
+if(HAVE_CXX_ATOMICS_WITHOUT_LIB)
+ message(STATUS "Atomics provided by the C-library - yes")
else()
-find_package(Boost 1.42 COMPONENTS system thread REQUIRED)
+ message(STATUS "Atomics provided by the C-library - no")
+ find_library(LIBATOMIC_LIBRARY NAMES atomic PATH_SUFFIXES lib)
+ if(LIBATOMIC_LIBRARY)
+ check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB "${LIBATOMIC_LIBRARY}")
+ if (HAVE_CXX_ATOMICS_WITH_LIB)
+ message(STATUS "Atomics provided by libatomic - yes")
+ else()
+ message(STATUS "Atomics provided by libatomic - no")
+ message(FATAL_ERROR "Compiler must support std::atomic!")
+ endif()
+ else()
+ message(FATAL_ERROR "Compiler appears to require libatomic, but cannot find it.")
+ endif()
endif()
+#===============================================================================
+#= System Introspection
+#-------------------------------------------------------------------------------
+
+include(memaccess)
+memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS)
+
#===============================================================================
#= Config Header
#-------------------------------------------------------------------------------
set(PV_TITLE PulseView)
-set(PV_DESCRIPTION "A GUI for sigrok")
+set(PV_VERSION_STRING "0.5.0")
-set(PV_VERSION_MAJOR 0)
-set(PV_VERSION_MINOR 1)
-set(PV_VERSION_MICRO 0)
-set(PV_VERSION_STRING
- ${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}
-)
+set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION})
+
+include(GetGitRevisionDescription)
+
+# Append the revision hash unless we are exactly on a tagged release.
+git_describe(PV_TAG_VERSION_STRING --match "pulseview-${PV_VERSION_STRING}" --exact-match)
+if(NOT PV_TAG_VERSION_STRING)
+ get_git_head_revision(PV_REVSPEC PV_HASH)
+ if(PV_HASH)
+ string(SUBSTRING "${PV_HASH}" 0 7 PV_SHORTHASH)
+ set(PV_VERSION_STRING "${PV_VERSION_STRING}-git-${PV_SHORTHASH}")
+ endif()
+endif()
+
+if(PV_VERSION_STRING MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(-[-0-9a-z]*)?$")
+ set(PV_VERSION_MAJOR ${CMAKE_MATCH_1})
+ set(PV_VERSION_MINOR ${CMAKE_MATCH_2})
+ set(PV_VERSION_MICRO ${CMAKE_MATCH_3})
+ set(PV_VERSION_SUFFIX ${CMAKE_MATCH_4})
+endif()
+
+message("-- ${PV_TITLE} version: ${PV_VERSION_STRING}")
configure_file (
${PROJECT_SOURCE_DIR}/config.h.in
@@ -102,89 +189,135 @@ configure_file (
set(pulseview_SOURCES
main.cpp
+ pv/application.cpp
pv/devicemanager.cpp
+ pv/globalsettings.cpp
pv/mainwindow.cpp
- pv/sigsession.cpp
+ pv/session.cpp
+ pv/storesession.cpp
+ pv/util.cpp
+ pv/binding/binding.cpp
+ pv/binding/inputoutput.cpp
+ pv/binding/device.cpp
pv/data/analog.cpp
- pv/data/analogsnapshot.cpp
- pv/data/decoder.cpp
+ pv/data/analogsegment.cpp
pv/data/logic.cpp
- pv/data/logicsnapshot.cpp
+ pv/data/logicsegment.cpp
+ pv/data/signalbase.cpp
pv/data/signaldata.cpp
- pv/data/snapshot.cpp
- pv/dialogs/about.cpp
+ pv/data/segment.cpp
+ pv/devices/device.cpp
+ pv/devices/file.cpp
+ pv/devices/hardwaredevice.cpp
+ pv/devices/inputfile.cpp
+ pv/devices/sessionfile.cpp
pv/dialogs/connect.cpp
+ pv/dialogs/inputoutputoptions.cpp
+ pv/dialogs/settings.cpp
+ pv/dialogs/storeprogress.cpp
pv/popups/deviceoptions.cpp
- pv/popups/probes.cpp
+ pv/popups/channels.cpp
pv/prop/bool.cpp
pv/prop/double.cpp
pv/prop/enum.cpp
pv/prop/int.cpp
pv/prop/property.cpp
pv/prop/string.cpp
- pv/prop/binding/binding.cpp
- pv/prop/binding/decoderoptions.cpp
- pv/prop/binding/deviceoptions.cpp
- pv/toolbars/samplingbar.cpp
- pv/view/analogsignal.cpp
- pv/view/cursor.cpp
- pv/view/cursorpair.cpp
- pv/view/decodesignal.cpp
- pv/view/header.cpp
- pv/view/marginwidget.cpp
- pv/view/logicsignal.cpp
- pv/view/ruler.cpp
- pv/view/selectableitem.cpp
- pv/view/signal.cpp
- pv/view/timemarker.cpp
- pv/view/trace.cpp
- pv/view/tracepalette.cpp
- pv/view/view.cpp
- pv/view/viewport.cpp
- pv/view/decode/annotation.cpp
+ pv/toolbars/mainbar.cpp
+ pv/views/trace/analogsignal.cpp
+ pv/views/trace/cursor.cpp
+ pv/views/trace/cursorpair.cpp
+ pv/views/trace/flag.cpp
+ pv/views/trace/header.cpp
+ pv/views/trace/marginwidget.cpp
+ pv/views/trace/logicsignal.cpp
+ pv/views/trace/rowitem.cpp
+ pv/views/trace/ruler.cpp
+ pv/views/trace/signal.cpp
+ pv/views/trace/timeitem.cpp
+ pv/views/trace/timemarker.cpp
+ pv/views/trace/trace.cpp
+ pv/views/trace/tracegroup.cpp
+ pv/views/trace/tracepalette.cpp
+ pv/views/trace/tracetreeitem.cpp
+ pv/views/trace/tracetreeitemowner.cpp
+ pv/views/trace/triggermarker.cpp
+ pv/views/trace/view.cpp
+ pv/views/trace/viewitem.cpp
+ pv/views/trace/viewitemowner.cpp
+ pv/views/trace/viewitempaintparams.cpp
+ pv/views/trace/viewport.cpp
+ pv/views/trace/viewwidget.cpp
+ pv/views/viewbase.cpp
+ pv/views/trace/standardbar.cpp
pv/widgets/colourbutton.cpp
pv/widgets/colourpopup.cpp
+ pv/widgets/devicetoolbutton.cpp
+ pv/widgets/exportmenu.cpp
+ pv/widgets/importmenu.cpp
pv/widgets/popup.cpp
pv/widgets/popuptoolbutton.cpp
+ pv/widgets/sweeptimingwidget.cpp
+ pv/widgets/timestampspinbox.cpp
pv/widgets/wellarray.cpp
)
-# This list includes only QObject derrived class headers
+# This list includes only QObject derived class headers.
set(pulseview_HEADERS
- pv/mainwindow.h
- pv/sigsession.h
- pv/data/decoder.h
- pv/dialogs/about.h
- pv/dialogs/connect.h
- pv/popups/deviceoptions.h
- pv/popups/probes.h
- pv/prop/bool.h
- pv/prop/double.h
- pv/prop/enum.h
- pv/prop/int.h
- pv/prop/property.h
- pv/prop/string.h
- pv/toolbars/samplingbar.h
- pv/view/cursor.h
- pv/view/decodesignal.h
- pv/view/header.h
- pv/view/logicsignal.h
- pv/view/marginwidget.h
- pv/view/ruler.h
- pv/view/selectableitem.h
- pv/view/signal.h
- pv/view/timemarker.h
- pv/view/trace.h
- pv/view/view.h
- pv/view/viewport.h
- pv/widgets/colourbutton.h
- pv/widgets/colourpopup.h
- pv/widgets/popuptoolbutton.h
- pv/widgets/wellarray.h
-)
-
-set(pulseview_FORMS
- pv/dialogs/about.ui
+ pv/globalsettings.hpp
+ pv/mainwindow.hpp
+ pv/session.hpp
+ pv/storesession.hpp
+ pv/binding/device.hpp
+ pv/data/analog.hpp
+ pv/data/analogsegment.hpp
+ pv/data/logic.hpp
+ pv/data/logicsegment.hpp
+ pv/data/signalbase.hpp
+ pv/dialogs/connect.hpp
+ pv/dialogs/inputoutputoptions.hpp
+ pv/dialogs/settings.hpp
+ pv/dialogs/storeprogress.hpp
+ pv/popups/channels.hpp
+ pv/popups/deviceoptions.hpp
+ pv/prop/bool.hpp
+ pv/prop/double.hpp
+ pv/prop/enum.hpp
+ pv/prop/int.hpp
+ pv/prop/property.hpp
+ pv/prop/string.hpp
+ pv/toolbars/mainbar.hpp
+ pv/views/trace/analogsignal.hpp
+ pv/views/trace/cursor.hpp
+ pv/views/trace/flag.hpp
+ pv/views/trace/header.hpp
+ pv/views/trace/logicsignal.hpp
+ pv/views/trace/marginwidget.hpp
+ pv/views/trace/rowitem.hpp
+ pv/views/trace/ruler.hpp
+ pv/views/trace/signal.hpp
+ pv/views/trace/timeitem.hpp
+ pv/views/trace/timemarker.hpp
+ pv/views/trace/trace.hpp
+ pv/views/trace/tracegroup.hpp
+ pv/views/trace/tracetreeitem.hpp
+ pv/views/trace/triggermarker.hpp
+ pv/views/trace/view.hpp
+ pv/views/trace/viewitem.hpp
+ pv/views/trace/viewport.hpp
+ pv/views/trace/viewwidget.hpp
+ pv/views/viewbase.hpp
+ pv/views/trace/standardbar.hpp
+ pv/widgets/colourbutton.hpp
+ pv/widgets/colourpopup.hpp
+ pv/widgets/devicetoolbutton.hpp
+ pv/widgets/exportmenu.hpp
+ pv/widgets/importmenu.hpp
+ pv/widgets/popup.hpp
+ pv/widgets/popuptoolbutton.hpp
+ pv/widgets/sweeptimingwidget.hpp
+ pv/widgets/timestampspinbox.hpp
+ pv/widgets/wellarray.hpp
)
set(pulseview_RESOURCES
@@ -193,26 +326,68 @@ set(pulseview_RESOURCES
if(ENABLE_SIGNALS)
list(APPEND pulseview_SOURCES signalhandler.cpp)
- list(APPEND pulseview_HEADERS signalhandler.h)
+ list(APPEND pulseview_HEADERS signalhandler.hpp)
+endif()
+
+if(ENABLE_DECODE)
+ list(APPEND pulseview_SOURCES
+ pv/binding/decoder.cpp
+ pv/data/decodesignal.cpp
+ pv/data/decode/annotation.cpp
+ pv/data/decode/decoder.cpp
+ pv/data/decode/row.cpp
+ pv/data/decode/rowdata.cpp
+ pv/views/trace/decodetrace.cpp
+ pv/widgets/decodergroupbox.cpp
+ pv/widgets/decodermenu.cpp
+ )
+
+ list(APPEND pulseview_HEADERS
+ pv/data/decodesignal.hpp
+ pv/views/trace/decodetrace.hpp
+ pv/widgets/decodergroupbox.hpp
+ pv/widgets/decodermenu.hpp
+ )
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})
+if(WIN32)
+ # Use the sigrok icon for the pulseview.exe executable.
+ set(CMAKE_RC_COMPILE_OBJECT "${CMAKE_RC_COMPILER} -O coff -I${CMAKE_CURRENT_SOURCE_DIR}