X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=a510bd6a2b3c8a39b93d516523e36b60e992ccf4;hp=3b41bff7980c1d1dcd7ba28870d846e42a556d1e;hb=b0e1d01d40977f5699745ecb53b89bc77ced8a5c;hpb=f617d9ace9f2cea2c0cba4c1337575cd6f7d1cf8 diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b41bff7..a510bd6a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,18 +46,14 @@ pkg_check_modules(PKGDEPS REQUIRED libsigrok>=0.2.0 ) +find_package(Qt4 REQUIRED) + # On Windows/MinGW we explicitly point cmake to the Boost directory. if(WIN32) set(BOOST_ROOT /usr/local) endif() -find_package(Qt4 REQUIRED) - -if(ENABLE_TESTS) -find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED) -else() -find_package(Boost 1.46) -endif() +find_package(Boost 1.46 COMPONENTS system thread) #=============================================================================== #= Config Header @@ -88,14 +84,16 @@ set(pulseview_SOURCES pv/datasnapshot.cpp pv/logicdata.cpp pv/logicdatasnapshot.cpp - pv/logicsignal.cpp pv/mainwindow.cpp pv/samplingbar.cpp pv/signaldata.cpp pv/sigsession.cpp - pv/signal.cpp + pv/view/cursor.cpp pv/view/header.cpp + pv/view/logicsignal.cpp pv/view/ruler.cpp + pv/view/signal.cpp + pv/view/timemarker.cpp pv/view/view.cpp pv/view/viewport.cpp ) @@ -105,8 +103,10 @@ set(pulseview_HEADERS pv/mainwindow.h pv/samplingbar.h pv/sigsession.h + pv/view/cursor.h pv/view/header.h pv/view/ruler.h + pv/view/timemarker.h pv/view/view.h pv/view/viewport.h ) @@ -130,6 +130,7 @@ include(${QT_USE_FILE}) #------------------------------------------------------------------------------- add_definitions(${QT_DEFINITIONS}) +add_definitions(-Werror -Wall) #=============================================================================== #= Global Include Directories