X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=94d32a41f1d53e6b892f81c6150f57b106bebba6;hp=0a754020586f10839fadceef949d09d9a4f16559;hb=0fbda3c2dda9357776afa15e99c037eb0cc97214;hpb=52bbe6001445a59a60c95de0f4320a8166b4bddd
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0a754020..94d32a41 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,9 +33,10 @@ 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" FALSE)
+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)
if(WIN32)
# On Windows/MinGW we need to statically link to libraries.
@@ -40,10 +44,10 @@ if(WIN32)
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
+ # Windows does not support UNIX signals.
set(ENABLE_SIGNALS FALSE)
endif()
@@ -51,17 +55,16 @@ endif()
#= Dependencies
#-------------------------------------------------------------------------------
-list(APPEND PKGDEPS
- libsigrok>=0.2.0
-)
+list(APPEND PKGDEPS libsigrok>=0.2.0)
-if(ENABLE_SIGROKDECODE)
+if(ENABLE_DECODE)
list(APPEND PKGDEPS libsigrokdecode>=0.2.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).
@@ -69,11 +72,11 @@ find_package(Qt4 REQUIRED)
find_package(Threads)
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)
+ # On Windows/MinGW 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)
else()
-find_package(Boost 1.42 COMPONENTS system thread REQUIRED)
+ find_package(Boost 1.42 COMPONENTS system thread REQUIRED)
endif()
#===============================================================================
@@ -104,6 +107,7 @@ set(pulseview_SOURCES
pv/devicemanager.cpp
pv/mainwindow.cpp
pv/sigsession.cpp
+ pv/storesession.cpp
pv/data/analog.cpp
pv/data/analogsnapshot.cpp
pv/data/logic.cpp
@@ -112,12 +116,15 @@ set(pulseview_SOURCES
pv/data/snapshot.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
- pv/dialogs/deviceoptions.cpp
+ pv/dialogs/storeprogress.cpp
+ pv/popups/deviceoptions.cpp
+ pv/popups/probes.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/samplingbar.cpp
@@ -125,27 +132,56 @@ set(pulseview_SOURCES
pv/view/cursor.cpp
pv/view/cursorpair.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/widgets/colourbutton.cpp
+ pv/widgets/colourpopup.cpp
+ pv/widgets/popup.cpp
+ pv/widgets/popuptoolbutton.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/dialogs/about.h
pv/dialogs/connect.h
- pv/dialogs/deviceoptions.h
+ pv/dialogs/storeprogress.h
+ pv/popups/probes.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/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/wellarray.h
)
set(pulseview_FORMS
@@ -161,6 +197,33 @@ if(ENABLE_SIGNALS)
list(APPEND pulseview_HEADERS signalhandler.h)
endif()
+if(ENABLE_DECODE)
+ list(APPEND pulseview_SOURCES
+ pv/data/decoderstack.cpp
+ pv/data/decode/annotation.cpp
+ pv/data/decode/decoder.cpp
+ pv/prop/binding/decoderoptions.cpp
+ pv/view/decodetrace.cpp
+ pv/widgets/decodergroupbox.cpp
+ pv/widgets/decodermenu.cpp
+ pv/widgets/wellarray.cpp
+ )
+
+ list(APPEND pulseview_HEADERS
+ pv/data/decoderstack.h
+ pv/view/decodetrace.h
+ pv/widgets/decodergroupbox.h
+ pv/widgets/decodermenu.h
+ )
+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}