X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=e542200fee57ad750bdaa41dd3dd902b746dcc66;hb=b2474b8dc0bec392d0cbe7cd18d342e3c9e42f63;hp=2ea44dba08084bf4d3bcc15f385f3d5ea7c1f873;hpb=b1fe148e0dce6e369c9d4770ca935a6a9ec94b59;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ea44db..e542200 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>
@@ -24,7 +24,6 @@ include(FindPkgConfig)
 include(GNUInstallDirs)
 
 set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
-include(cotire)
 
 project(pulseview)
 
@@ -34,6 +33,8 @@ project(pulseview)
 
 option(DISABLE_WERROR "Build without -Werror" FALSE)
 option(ENABLE_SIGNALS "Build with UNIX signals" TRUE)
+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)
 
@@ -56,9 +57,12 @@ endif()
 
 list(APPEND PKGDEPS
 	libsigrok>=0.2.0
-	libsigrokdecode>=0.2.0
 )
 
+if(ENABLE_DECODE)
+	list(APPEND PKGDEPS libsigrokdecode>=0.2.0)
+endif()
+
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED ${PKGDEPS})
 
@@ -107,14 +111,12 @@ set(pulseview_SOURCES
 	pv/sigsession.cpp
 	pv/data/analog.cpp
 	pv/data/analogsnapshot.cpp
-	pv/data/decoder.cpp
 	pv/data/logic.cpp
 	pv/data/logicsnapshot.cpp
 	pv/data/signaldata.cpp
 	pv/data/snapshot.cpp
 	pv/dialogs/about.cpp
 	pv/dialogs/connect.cpp
-	pv/dialogs/decoder.cpp
 	pv/popups/deviceoptions.cpp
 	pv/popups/probes.cpp
 	pv/prop/bool.cpp
@@ -124,13 +126,11 @@ set(pulseview_SOURCES
 	pv/prop/property.cpp
 	pv/prop/string.cpp
 	pv/prop/binding/binding.cpp
-	pv/prop/binding/decoderoptions.cpp
 	pv/prop/binding/deviceoptions.cpp
 	pv/toolbars/samplingbar.cpp
 	pv/view/analogsignal.cpp
 	pv/view/cursor.cpp
 	pv/view/cursorpair.cpp
-	pv/view/decodesignal.cpp
 	pv/view/header.cpp
 	pv/view/marginwidget.cpp
 	pv/view/logicsignal.cpp
@@ -142,7 +142,6 @@ set(pulseview_SOURCES
 	pv/view/tracepalette.cpp
 	pv/view/view.cpp
 	pv/view/viewport.cpp
-	pv/view/decode/annotation.cpp
 	pv/widgets/colourbutton.cpp
 	pv/widgets/colourpopup.cpp
 	pv/widgets/popup.cpp
@@ -154,11 +153,10 @@ set(pulseview_SOURCES
 set(pulseview_HEADERS
 	pv/mainwindow.h
 	pv/sigsession.h
-	pv/data/decoder.h
 	pv/dialogs/about.h
 	pv/dialogs/connect.h
-	pv/popups/deviceoptions.h
 	pv/popups/probes.h
+	pv/popups/deviceoptions.h
 	pv/prop/bool.h
 	pv/prop/double.h
 	pv/prop/enum.h
@@ -167,7 +165,6 @@ set(pulseview_HEADERS
 	pv/prop/string.h
 	pv/toolbars/samplingbar.h
 	pv/view/cursor.h
-	pv/view/decodesignal.h
 	pv/view/header.h
 	pv/view/logicsignal.h
 	pv/view/marginwidget.h
@@ -180,6 +177,7 @@ set(pulseview_HEADERS
 	pv/view/viewport.h
 	pv/widgets/colourbutton.h
 	pv/widgets/colourpopup.h
+	pv/widgets/popup.h
 	pv/widgets/popuptoolbutton.h
 	pv/widgets/wellarray.h
 )
@@ -197,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})
@@ -208,8 +226,13 @@ include(${QT_USE_FILE})
 #-------------------------------------------------------------------------------
 
 add_definitions(${QT_DEFINITIONS})
+add_definitions(-D__STDC_LIMIT_MACROS)
 add_definitions(-Wall -Wextra)
 
+if(ENABLE_DECODE)
+	add_definitions(-DENABLE_DECODE)
+endif()
+
 if(NOT DISABLE_WERROR)
 	add_definitions(-Werror)
 endif()
@@ -258,13 +281,17 @@ add_executable(${PROJECT_NAME}
 )
 
 target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
-cotire(${PROJECT_NAME})
 
 if(WIN32)
 # Pass -mwindows so that no "DOS box" will open when PulseView is started.
 set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
 endif()
 
+if(ENABLE_COTIRE)
+	include(cotire)
+	cotire(${PROJECT_NAME})
+endif()
+
 #===============================================================================
 #= Installation
 #-------------------------------------------------------------------------------