Added a String property

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6552df173e9b5481f0cafc3b6e9d7a10642543fd..74b91af9601c3102e06d38da89f27f5e2b8fe15a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,10 +18,14 @@
 ## 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")
+include(cotire)
+
 project(pulseview)
 
 #===============================================================================
@@ -30,7 +34,6 @@ 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_TESTS "Enable unit tests" FALSE)
 option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
 
@@ -53,15 +56,13 @@ endif()
 
 list(APPEND PKGDEPS
        libsigrok>=0.2.0
+       libsigrokdecode>=0.2.0
 )
 
-if(ENABLE_SIGROKDECODE)
-       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).
@@ -106,48 +107,63 @@ 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/dialogs/deviceoptions.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/decoderoptions.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/decodesignal.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/view.cpp
        pv/view/viewport.cpp
+       pv/view/decode/annotation.cpp
 )
 
+# This list includes only QObject derrived class headers
 set(pulseview_HEADERS
        pv/mainwindow.h
        pv/sigsession.h
+       pv/data/decoder.h
        pv/dialogs/about.h
        pv/dialogs/connect.h
        pv/dialogs/deviceoptions.h
        pv/toolbars/contextbar.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
        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
 )
@@ -178,10 +194,6 @@ include(${QT_USE_FILE})
 add_definitions(${QT_DEFINITIONS})
 add_definitions(-Wall -Wextra)
 
-if(ENABLE_SIGROKDECODE)
-       add_definitions(-DENABLE_SIGROKDECODE)
-endif()
-
 if(NOT DISABLE_WERROR)
        add_definitions(-Werror)
 endif()
@@ -230,6 +242,7 @@ 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.