Make sigrokdecode a non-optional dependancy

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f32467b2a855b4a6682d1215214e9803b5e1046..724adcd60ba58a71a5149022237c569763f309ec 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,12 +56,9 @@ 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})
 
@@ -133,6 +133,7 @@ set(pulseview_SOURCES
        pv/view/selectableitem.cpp
        pv/view/signal.cpp
        pv/view/timemarker.cpp
+       pv/view/trace.cpp
        pv/view/view.cpp
        pv/view/viewport.cpp
 )
@@ -154,6 +155,7 @@ 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
 )
@@ -184,10 +186,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()
@@ -236,6 +234,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.