X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=d85948c095afbd7713709f0705c5f334a8dddb66;hb=b00f0979376c9af319fa929875a77f1612ce766c;hp=bc30c30ea3800a4c267a7be0cf4be92d246b2883;hpb=b08d7222556b0a56b4fc61782faa4664a0368d59;p=pulseview.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bc30c30..d85948c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,10 +18,13 @@
## along with this program. If not, see .
##
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.6)
+
include(FindPkgConfig)
include(GNUInstallDirs)
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
+
project(pulseview)
#===============================================================================
@@ -30,53 +33,72 @@ project(pulseview)
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_COTIRE "Enable cotire" FALSE)
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.
# 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, options are: None Debug Release RelWithDebInfo MinSizeRel."
+ FORCE)
+endif()
+
#===============================================================================
#= Dependencies
#-------------------------------------------------------------------------------
-list(APPEND PKGDEPS
- libsigrok>=0.2.0
-)
+list(APPEND PKGDEPS libsigrok>=0.3.0)
-if(ENABLE_SIGROKDECODE)
- list(APPEND PKGDEPS libsigrokdecode>=0.2.0)
+if(ENABLE_DECODE)
+ list(APPEND PKGDEPS libsigrokdecode>=0.3.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)
-
-# 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 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(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
#-------------------------------------------------------------------------------
@@ -85,7 +107,7 @@ set(PV_TITLE PulseView)
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}
@@ -105,26 +127,35 @@ set(pulseview_SOURCES
pv/devicemanager.cpp
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/sessionfile.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
- pv/dialogs/deviceoptions.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/string.cpp
pv/prop/binding/binding.cpp
pv/prop/binding/deviceoptions.cpp
- pv/toolbars/contextbar.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
@@ -133,19 +164,38 @@ set(pulseview_SOURCES
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/widgets/colourbutton.cpp
+ pv/widgets/colourpopup.cpp
+ pv/widgets/popup.cpp
+ pv/widgets/popuptoolbutton.cpp
+ pv/widgets/sweeptimingwidget.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/deviceoptions.h
- pv/toolbars/contextbar.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
@@ -153,8 +203,15 @@ set(pulseview_HEADERS
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
@@ -170,27 +227,70 @@ if(ENABLE_SIGNALS)
list(APPEND pulseview_HEADERS signalhandler.h)
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/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
+ )
+endif()
-include(${QT_USE_FILE})
+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}