Consistenty use auto-generated namespace comments.
[pulseview.git] / CMakeLists.txt
index d85948c095afbd7713709f0705c5f334a8dddb66..f4325bf7dcfdb16928a53a1fc62559e3e3342fda 100644 (file)
 
 cmake_minimum_required(VERSION 2.8.6)
 
-include(FindPkgConfig)
 include(GNUInstallDirs)
 
-set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
-
 project(pulseview)
 
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
+
 #===============================================================================
 #= User Options
 #-------------------------------------------------------------------------------
@@ -34,8 +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" TRUE)
-option(ENABLE_COTIRE "Enable cotire" FALSE)
-option(ENABLE_TESTS "Enable unit tests" FALSE)
+option(ENABLE_TESTS "Enable unit tests" TRUE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkg-config) libraries" FALSE)
 option(FORCE_QT4 "Force use of Qt4 even if Qt5 is available" FALSE)
 
@@ -44,24 +42,32 @@ 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)
+
+       # On Windows/MinGW we need to use 'thread_win32' instead of 'thread'.
+       # The library is named libboost_thread_win32* (not libboost_thread*).
+       set(Boost_THREADAPI win32)
+
        # 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)
+       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.3.0)
+list(APPEND PKGDEPS libsigrokcxx>=0.4.0)
 
 if(ENABLE_DECODE)
-       list(APPEND PKGDEPS libsigrokdecode>=0.3.0)
+       list(APPEND PKGDEPS libsigrokdecode>=0.4.0)
 endif()
 
 if(ANDROID)
@@ -75,22 +81,85 @@ if(FORCE_QT4)
        set(Qt5Core_FOUND FALSE)
 else()
        find_package(Qt5Core QUIET)
+if(WIN32)
+       # 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()
 endif()
 
 if(Qt5Core_FOUND)
        message("-- Using Qt5")
        find_package(Qt5Widgets REQUIRED)
        find_package(Qt5Gui REQUIRED)
+       find_package(Qt5Svg 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)
+       set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Svg)
        add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
 else()
        find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
-       find_package(Qt4 REQUIRED)
+       find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
 endif()
 
-find_package(Boost 1.42 COMPONENTS filesystem system REQUIRED)
+set(BOOSTCOMPS filesystem serialization system thread)
+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 <atomic>
+std::atomic<int> 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()
+  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
@@ -105,13 +174,28 @@ memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS)
 
 set(PV_TITLE PulseView)
 set(PV_DESCRIPTION "A GUI for sigrok")
+set(PV_VERSION_STRING "0.4.0")
+
+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()
 
-set(PV_VERSION_MAJOR 0)
-set(PV_VERSION_MINOR 2)
-set(PV_VERSION_MICRO 0)
-set(PV_VERSION_STRING
-       ${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}
-)
+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
@@ -124,23 +208,31 @@ 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/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/device/device.cpp
-       pv/device/file.cpp
-       pv/device/devinst.cpp
-       pv/device/sessionfile.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/channels.cpp
@@ -150,72 +242,103 @@ set(pulseview_SOURCES
        pv/prop/int.cpp
        pv/prop/property.cpp
        pv/prop/string.cpp
-       pv/prop/binding/binding.cpp
-       pv/prop/binding/deviceoptions.cpp
-       pv/toolbars/samplingbar.cpp
+       pv/toolbars/mainbar.cpp
        pv/view/analogsignal.cpp
        pv/view/cursor.cpp
-       pv/view/cursorheader.cpp
        pv/view/cursorpair.cpp
+       pv/view/flag.cpp
        pv/view/header.cpp
        pv/view/marginwidget.cpp
        pv/view/logicsignal.cpp
+       pv/view/rowitem.cpp
        pv/view/ruler.cpp
-       pv/view/selectableitem.cpp
        pv/view/signal.cpp
+       pv/view/signalscalehandle.cpp
+       pv/view/timeitem.cpp
        pv/view/timemarker.cpp
        pv/view/trace.cpp
+       pv/view/tracegroup.cpp
        pv/view/tracepalette.cpp
+       pv/view/tracetreeitem.cpp
+       pv/view/tracetreeitemowner.cpp
+       pv/view/triggermarker.cpp
        pv/view/view.cpp
+       pv/view/viewitem.cpp
+       pv/view/viewitemowner.cpp
+       pv/view/viewitempaintparams.cpp
        pv/view/viewport.cpp
+       pv/view/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 derived class headers.
 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/channels.h
-       pv/popups/deviceoptions.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/cursorheader.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/popup.h
-       pv/widgets/popuptoolbutton.h
-       pv/widgets/sweeptimingwidget.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/view/analogsignal.hpp
+       pv/view/cursor.hpp
+       pv/view/flag.hpp
+       pv/view/header.hpp
+       pv/view/logicsignal.hpp
+       pv/view/marginwidget.hpp
+       pv/view/rowitem.hpp
+       pv/view/ruler.hpp
+       pv/view/signal.hpp
+       pv/view/signalscalehandle.hpp
+       pv/view/timeitem.hpp
+       pv/view/timemarker.hpp
+       pv/view/trace.hpp
+       pv/view/tracegroup.hpp
+       pv/view/tracetreeitem.hpp
+       pv/view/triggermarker.hpp
+       pv/view/view.hpp
+       pv/view/viewitem.hpp
+       pv/view/viewport.hpp
+       pv/view/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
@@ -224,27 +347,27 @@ 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/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
        )
 
        list(APPEND pulseview_HEADERS
-               pv/data/decoderstack.h
-               pv/view/decodetrace.h
-               pv/widgets/decodergroupbox.h
-               pv/widgets/decodermenu.h
+               pv/data/decoderstack.hpp
+               pv/view/decodetrace.hpp
+               pv/widgets/decodergroupbox.hpp
+               pv/widgets/decodermenu.hpp
        )
 endif()
 
@@ -256,16 +379,20 @@ if(WIN32)
 endif()
 
 if(ANDROID)
-       list(APPEND pulseview_SOURCES android/loghandler.cpp)
+       list(APPEND pulseview_SOURCES
+               android/assetreader.cpp
+               android/loghandler.cpp
+       )
 endif()
 
 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})
+       # Workaround for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.
+       # https://bugreports.qt.io/browse/QTBUG-22829
+       qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}
+               OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
        qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
        include(${QT_USE_FILE})
 endif()
@@ -278,6 +405,7 @@ add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
 add_definitions(-D__STDC_LIMIT_MACROS)
 add_definitions(-Wall -Wextra)
 add_definitions(-std=c++11)
+add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1)
 
 if(ENABLE_DECODE)
        add_definitions(-DENABLE_DECODE)
@@ -317,15 +445,13 @@ link_directories(${Boost_LIBRARY_DIRS})
 set(PULSEVIEW_LINK_LIBS
        ${Boost_LIBRARIES}
        ${QT_LIBRARIES}
+       ${CMAKE_THREAD_LIBS_INIT}
+       ${LIBATOMIC_LIBRARY}
 )
 
 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()
+       list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LDFLAGS})
 else()
        link_directories(${PKGDEPS_LIBRARY_DIRS})
        list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})
@@ -334,10 +460,12 @@ endif()
 if(WIN32)
        # On Windows we need to statically link the libqsvg imageformat
        # plugin (and the QtSvg component) for SVG graphics/icons to work.
+       # We also need QWindowsIntegrationPlugin, Qt5PlatformSupport, and all
+       # Qt libs and their dependencies.
        add_definitions(-DQT_STATICPLUGIN)
-       link_directories("${QT_PLUGINS_DIR}/imageformats")
-       list(APPEND PULSEVIEW_LINK_LIBS ${QT_QTSVG_LIBRARY})
-       list(APPEND PULSEVIEW_LINK_LIBS "-lqsvg")
+       list(APPEND PULSEVIEW_LINK_LIBS Qt5::QSvgPlugin)
+       list(APPEND PULSEVIEW_LINK_LIBS Qt5::QWindowsIntegrationPlugin)
+       list(APPEND PULSEVIEW_LINK_LIBS -lQt5PlatformSupport ${QT5ALL_LDFLAGS})
 endif()
 
 if(ANDROID)
@@ -348,14 +476,12 @@ if(ANDROID)
 add_library(${PROJECT_NAME} SHARED
        ${pulseview_SOURCES}
        ${pulseview_HEADERS_MOC}
-       ${pulseview_FORMS_HEADERS}
        ${pulseview_RESOURCES_RCC}
 )
 else()
 add_executable(${PROJECT_NAME}
        ${pulseview_SOURCES}
        ${pulseview_HEADERS_MOC}
-       ${pulseview_FORMS_HEADERS}
        ${pulseview_RESOURCES_RCC}
 )
 endif()
@@ -367,11 +493,6 @@ if(WIN32)
        set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
 endif()
 
-if(ENABLE_COTIRE)
-       include(cotire)
-       cotire(${PROJECT_NAME})
-endif()
-
 #===============================================================================
 #= Installation
 #-------------------------------------------------------------------------------
@@ -382,6 +503,9 @@ install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
 # Install the manpage.
 install(FILES doc/pulseview.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc)
 
+# Generate Windows installer script.
+configure_file(contrib/pulseview_cross.nsi.in contrib/pulseview_cross.nsi @ONLY)
+
 #===============================================================================
 #= Packaging (handled by CPack)
 #-------------------------------------------------------------------------------
@@ -392,8 +516,7 @@ set(CPACK_PACKAGE_VERSION_PATCH ${PV_VERSION_MICRO})
 set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README)
 set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING)
 set(CPACK_SOURCE_IGNORE_FILES ${CMAKE_CURRENT_BINARY_DIR} ".gitignore" ".git")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME
-       "${CMAKE_PROJECT_NAME}-${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}")
+set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PV_VERSION_STRING}")
 set(CPACK_SOURCE_GENERATOR "TGZ")
 
 include(CPack)