## along with this program. If not, see <http://www.gnu.org/licenses/>.
##
-cmake_minimum_required(VERSION 2.8.6)
+cmake_minimum_required(VERSION 2.8.12)
include(GNUInstallDirs)
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)
-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)
-
- # 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()
#= Dependencies
#-------------------------------------------------------------------------------
-list(APPEND PKGDEPS libsigrokcxx>=0.4.0)
+list(APPEND PKGDEPS glib-2.0>=2.28.0)
+list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
+
+list(APPEND PKGDEPS libsigrokcxx>=0.5.0)
if(ENABLE_DECODE)
- list(APPEND PKGDEPS libsigrokdecode>=0.4.0)
+ list(APPEND PKGDEPS libsigrokdecode>=0.5.0)
endif()
if(ANDROID)
find_package(PkgConfig)
pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
-if(FORCE_QT4)
- set(Qt5Core_FOUND FALSE)
-else()
- find_package(Qt5Core QUIET)
+set(CMAKE_AUTOMOC TRUE)
+
+find_package(Qt5 COMPONENTS Core Gui Widgets Svg REQUIRED)
+
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 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()
+set(QT_LIBRARIES Qt5::Gui Qt5::Widgets Qt5::Svg)
-set(BOOSTCOMPS filesystem serialization system thread)
+set(BOOSTCOMPS filesystem serialization system)
if(ENABLE_TESTS)
list(APPEND BOOSTCOMPS unit_test_framework)
endif()
# 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
#-------------------------------------------------------------------------------
set(PV_TITLE PulseView)
-set(PV_DESCRIPTION "A GUI for sigrok")
-set(PV_VERSION_STRING "0.4.0")
+set(PV_VERSION_STRING "0.5.0")
+
+set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION})
include(GetGitRevisionDescription)
main.cpp
pv/application.cpp
pv/devicemanager.cpp
+ pv/globalsettings.cpp
pv/mainwindow.cpp
pv/session.cpp
pv/storesession.cpp
pv/devices/hardwaredevice.cpp
pv/devices/inputfile.cpp
pv/devices/sessionfile.cpp
- pv/dialogs/about.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
pv/prop/property.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/ruler.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/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/signalscalehandle.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
# This list includes only QObject derived class headers.
set(pulseview_HEADERS
+ pv/globalsettings.hpp
pv/mainwindow.hpp
pv/session.hpp
pv/storesession.hpp
pv/data/logic.hpp
pv/data/logicsegment.hpp
pv/data/signalbase.hpp
- pv/dialogs/about.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/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/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/signalscalehandle.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/wellarray.hpp
)
-set(pulseview_FORMS
- pv/dialogs/about.ui
-)
-
set(pulseview_RESOURCES
pulseview.qrc
)
if(ENABLE_DECODE)
list(APPEND pulseview_SOURCES
pv/binding/decoder.cpp
- pv/data/decoderstack.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/view/decodetrace.cpp
+ pv/views/trace/decodetrace.cpp
pv/widgets/decodergroupbox.cpp
pv/widgets/decodermenu.cpp
)
list(APPEND pulseview_HEADERS
- pv/data/decoderstack.hpp
- pv/view/decodetrace.hpp
+ pv/data/decodesignal.hpp
+ pv/views/trace/decodetrace.hpp
pv/widgets/decodergroupbox.hpp
pv/widgets/decodermenu.hpp
)
)
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()
- # 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_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
- qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
- include(${QT_USE_FILE})
-endif()
+qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
#===============================================================================
#= Global Definitions
#-------------------------------------------------------------------------------
-add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
+add_definitions(-DQT_NO_KEYWORDS)
add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-Wall -Wextra)
add_definitions(-std=c++11)
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${Boost_INCLUDE_DIRS}
- ${QT_INCLUDE_DIRS}
)
if(STATIC_PKGDEPS_LIBS)
endif()
if(ANDROID)
-add_library(${PROJECT_NAME} SHARED
- ${pulseview_SOURCES}
- ${pulseview_HEADERS_MOC}
- ${pulseview_FORMS_HEADERS}
- ${pulseview_RESOURCES_RCC}
-)
+ add_library(${PROJECT_NAME} SHARED ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC})
else()
-add_executable(${PROJECT_NAME}
- ${pulseview_SOURCES}
- ${pulseview_HEADERS_MOC}
- ${pulseview_FORMS_HEADERS}
- ${pulseview_RESOURCES_RCC}
-)
+ add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC})
endif()
target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
# Install the manpage.
install(FILES doc/pulseview.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc)
+# Install the desktop file.
+install(FILES contrib/org.sigrok.PulseView.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications)
+
+# Install the AppData/AppStream file.
+install(FILES contrib/org.sigrok.PulseView.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
+
+# Install the PulseView icons.
+install(FILES icons/pulseview.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps)
+install(FILES icons/pulseview.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
+
# Generate Windows installer script.
configure_file(contrib/pulseview_cross.nsi.in contrib/pulseview_cross.nsi @ONLY)
projects / pulseview.git / blobdiff