## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.6)
+
include(FindPkgConfig)
+include(GNUInstallDirs)
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_SIGROKDECODE "Build with libsigrokdecode" FALSE)
+option(ENABLE_DECODE "Build with libsigrokdecode" TRUE)
option(ENABLE_TESTS "Enable unit tests" FALSE)
-option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" 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.
set(STATIC_PKGDEPS_LIBS TRUE)
# For boost-thread we need two additional settings on win32:
- set(Boost_USE_STATIC_LIBS on)
+ set(Boost_USE_STATIC_LIBS ON)
add_definitions(-DBOOST_THREAD_USE_LIB)
- # Windsws does not support UNIX signals
+ # 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 (None, Debug, Release, RelWithDebInfo, MinSizeRel)."
+ FORCE)
+endif()
+
#===============================================================================
#= Dependencies
#-------------------------------------------------------------------------------
-list(APPEND PKGDEPS
- libsigrok>=0.2.0
-)
+list(APPEND PKGDEPS libsigrokcxx>=0.4.0)
+
+if(ENABLE_DECODE)
+ list(APPEND PKGDEPS libsigrokdecode>=0.4.0)
+endif()
-if(ENABLE_SIGROKDECODE)
- list(APPEND PKGDEPS libsigrokdecode>=0.2.0)
+if(ANDROID)
+ list(APPEND PKGDEPS libsigrokandroidutils>=0.1.0)
endif()
find_package(PkgConfig)
pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
-find_package(Qt4 REQUIRED)
+if(FORCE_QT4)
+ set(Qt5Core_FOUND FALSE)
+else()
+ find_package(Qt5Core QUIET)
+endif()
-# 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(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 Qt5::Svg)
+ add_definitions(${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS})
+else()
+ find_program(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac)
+ find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
+endif()
-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)
+if(ENABLE_TESTS)
+ find_package(Boost 1.48 COMPONENTS filesystem system thread unit_test_framework REQUIRED)
else()
-find_package(Boost 1.42 COMPONENTS system thread REQUIRED)
+ find_package(Boost 1.48 COMPONENTS filesystem system thread REQUIRED)
endif()
+# 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)
+
+#===============================================================================
+#= 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.3.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}
-)
+include(GetGitRevisionDescription)
+git_describe(PV_TAG_VERSION_STRING --tags --dirty)
+
+if(NOT PV_TAG_VERSION_STRING AND EXISTS "${PROJECT_SOURCE_DIR}/VERSION")
+ # Read the version from a file that is distributed with
+ # the source package (see writepackageversion.cmake).
+ file(STRINGS "${PROJECT_SOURCE_DIR}/VERSION" PV_TAG_VERSION_STRING LIMIT_COUNT 1)
+endif()
+
+if(PV_TAG_VERSION_STRING MATCHES
+ "^pulseview-([0-9]+\\.[0-9]+\\.[0-9]+)(-[0-9a-z]+)?(-g[-0-9a-z]+)?$")
+ set(PV_TAG_VERSION ${CMAKE_MATCH_1})
+ set(PV_TAG_PATCHLEVEL ${CMAKE_MATCH_2})
+ set(PV_TAG_REVHASH ${CMAKE_MATCH_3})
+
+ if(PV_VERSION_STRING VERSION_GREATER ${PV_TAG_VERSION})
+ # Tagged version older than current one: indicate pre-release.
+ set(PV_VERSION_STRING "${PV_VERSION_STRING}-pre${PV_TAG_REVHASH}")
+ else()
+ # For post-release changes, indicate the patch level.
+ set(PV_VERSION_STRING "${PV_TAG_VERSION}${PV_TAG_PATCHLEVEL}${PV_TAG_REVHASH}")
+ 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
set(pulseview_SOURCES
main.cpp
+ pv/application.cpp
pv/devicemanager.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/signaldata.cpp
- pv/data/snapshot.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/about.cpp
pv/dialogs/connect.cpp
- pv/dialogs/deviceoptions.cpp
+ pv/dialogs/inputoutputoptions.cpp
+ pv/dialogs/storeprogress.cpp
+ pv/popups/deviceoptions.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/binding/binding.cpp
- pv/prop/binding/deviceoptions.cpp
- pv/toolbars/samplingbar.cpp
+ pv/prop/string.cpp
+ pv/toolbars/mainbar.cpp
pv/view/analogsignal.cpp
pv/view/cursor.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/rowitemowner.cpp
pv/view/ruler.cpp
pv/view/signal.cpp
+ pv/view/timeitem.cpp
pv/view/timemarker.cpp
+ pv/view/trace.cpp
+ pv/view/tracegroup.cpp
+ pv/view/tracepalette.cpp
pv/view/view.cpp
+ pv/view/viewitem.cpp
+ pv/view/viewitempaintparams.cpp
pv/view/viewport.cpp
+ pv/view/viewwidget.cpp
+ pv/widgets/colourbutton.cpp
+ pv/widgets/colourpopup.cpp
+ pv/widgets/devicetoolbutton.cpp
+ pv/widgets/exportmenu.cpp
+ pv/widgets/hidingmenubar.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/dialogs/about.h
- pv/dialogs/connect.h
- pv/dialogs/deviceoptions.h
- pv/toolbars/samplingbar.h
- pv/view/cursor.h
- pv/view/header.h
- pv/view/ruler.h
- pv/view/timemarker.h
- pv/view/view.h
- pv/view/viewport.h
+ pv/mainwindow.hpp
+ pv/session.hpp
+ pv/storesession.hpp
+ pv/binding/device.hpp
+ pv/dialogs/about.hpp
+ pv/dialogs/connect.hpp
+ pv/dialogs/inputoutputoptions.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/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/timeitem.hpp
+ pv/view/timemarker.hpp
+ pv/view/trace.hpp
+ pv/view/tracegroup.hpp
+ pv/view/view.hpp
+ pv/view/viewitem.hpp
+ pv/view/viewport.hpp
+ pv/view/viewwidget.hpp
+ pv/widgets/colourbutton.hpp
+ pv/widgets/colourpopup.hpp
+ pv/widgets/devicetoolbutton.hpp
+ pv/widgets/exportmenu.hpp
+ pv/widgets/hidingmenubar.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_FORMS
if(ENABLE_SIGNALS)
list(APPEND pulseview_SOURCES signalhandler.cpp)
- list(APPEND pulseview_HEADERS signalhandler.h)
+ list(APPEND pulseview_HEADERS signalhandler.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(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/view/decodetrace.cpp
+ pv/widgets/decodergroupbox.cpp
+ pv/widgets/decodermenu.cpp
+ )
+
+ list(APPEND pulseview_HEADERS
+ pv/data/decoderstack.hpp
+ pv/view/decodetrace.hpp
+ pv/widgets/decodergroupbox.hpp
+ pv/widgets/decodermenu.hpp
+ )
+endif()
+
+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} <SOURCE> <OBJECT>")
+ enable_language(RC)
+ list(APPEND pulseview_SOURCES pulseviewico.rc)
+endif()
-include(${QT_USE_FILE})
+if(ANDROID)
+ list(APPEND pulseview_SOURCES 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()
+ # Workaroud 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_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(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
+add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-Wall -Wextra)
+add_definitions(-std=c++11)
-if(ENABLE_SIGROKDECODE)
- add_definitions(-DENABLE_SIGROKDECODE)
+if(ENABLE_DECODE)
+ add_definitions(-DENABLE_DECODE)
endif()
if(NOT DISABLE_WERROR)
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}
+ ${CMAKE_THREAD_LIBS_INIT}
)
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})
endif()
+if(WIN32)
+ # On Windows we need to statically link the libqsvg imageformat
+ # plugin (and the QtSvg component) for SVG graphics/icons to work.
+ add_definitions(-DQT_STATICPLUGIN)
+ link_directories("${QT_PLUGINS_DIR}/imageformats")
+ list(APPEND PULSEVIEW_LINK_LIBS "-lqsvg")
+ list(APPEND PULSEVIEW_LINK_LIBS ${QT_QTSVG_LIBRARY})
+endif()
+
+if(ANDROID)
+ list(APPEND PULSEVIEW_LINK_LIBS "-llog")
+endif()
+
+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()
target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
if(WIN32)
-# Pass -mwindows so that no "DOS box" will open when PulseView is started.
-set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
+ # Pass -mwindows so that no "DOS box" opens when PulseView is started.
+ set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
endif()
#===============================================================================
#= Installation
#-------------------------------------------------------------------------------
+# Install the executable.
install(TARGETS ${PROJECT_NAME} DESTINATION bin/)
+# Install the manpage.
+install(FILES doc/pulseview.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc)
+
#===============================================================================
#= Packaging (handled by CPack)
#-------------------------------------------------------------------------------
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")
+set(CPACK_INSTALL_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/CMake/writepackageversion.cmake)
include(CPack)
add_subdirectory(test)
enable_testing()
add_test(test ${CMAKE_CURRENT_BINARY_DIR}/test/pulseview-test)
-endif(ENABLE_TESTS)
+endif()
projects / pulseview.git / blobdiff