X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=e542200fee57ad750bdaa41dd3dd902b746dcc66;hp=6552df173e9b5481f0cafc3b6e9d7a10642543fd;hb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;hpb=2a2512b21581ea346fea7d96bd3deeb37f1cfed4

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6552df17..e542200f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-##
+
 ## This file is part of the PulseView project.
 ##
 ## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
@@ -18,10 +18,13 @@
 ## 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)
 
+set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
+
 project(pulseview)
 
 #===============================================================================
@@ -30,7 +33,8 @@ 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_TESTS "Enable cotire" FALSE)
 option(ENABLE_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
 
@@ -55,13 +59,14 @@ 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).
@@ -112,44 +117,69 @@ set(pulseview_SOURCES
 	pv/data/snapshot.cpp
 	pv/dialogs/about.cpp
 	pv/dialogs/connect.cpp
-	pv/dialogs/deviceoptions.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/contextbar.cpp
 	pv/toolbars/samplingbar.cpp
 	pv/view/analogsignal.cpp
 	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 derrived 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/contextbar.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
@@ -165,6 +195,26 @@ 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()
+
 qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
 qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
 qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
@@ -176,10 +226,11 @@ include(${QT_USE_FILE})
 #-------------------------------------------------------------------------------
 
 add_definitions(${QT_DEFINITIONS})
+add_definitions(-D__STDC_LIMIT_MACROS)
 add_definitions(-Wall -Wextra)
 
-if(ENABLE_SIGROKDECODE)
-	add_definitions(-DENABLE_SIGROKDECODE)
+if(ENABLE_DECODE)
+	add_definitions(-DENABLE_DECODE)
 endif()
 
 if(NOT DISABLE_WERROR)
@@ -236,6 +287,11 @@ if(WIN32)
 set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
 endif()
 
+if(ENABLE_COTIRE)
+	include(cotire)
+	cotire(${PROJECT_NAME})
+endif()
+
 #===============================================================================
 #= Installation
 #-------------------------------------------------------------------------------