X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=52c5b56688f27f5b5e3d036fb741d52f545b2d37;hb=ffd5cd208c277b148d0e3a85d49330149f02f0c8;hp=9510a700bcf09f90cfb27d27a7f063ecd1bb7436;hpb=7d297a015d091b15f3bec4aee9d008b83a3d64af;p=pulseview.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 9510a70..52c5b56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,13 +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) -find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED) +find_package(Boost 1.46 COMPONENTS system thread) #=============================================================================== #= Config Header @@ -80,17 +81,22 @@ configure_file ( set(pulseview_SOURCES main.cpp pv/about.cpp + pv/analogdata.cpp + pv/analogdatasnapshot.cpp 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/analogsignal.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 ) @@ -100,8 +106,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 ) @@ -125,6 +133,7 @@ include(${QT_USE_FILE}) #------------------------------------------------------------------------------- add_definitions(${QT_DEFINITIONS}) +add_definitions(-Werror -Wall) #=============================================================================== #= Global Include Directories