X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=e1893b6c1c47a90edd29434b7de4f5e236a22889;hb=acda14b82957d9a848a5083df6f9b98d05c29fba;hp=1513d6dd1f14da578c66561859142628b6ed85ce;hpb=3efda736308edc11468a4b59bdb28d5793902529;p=pulseview.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 1513d6d..e1893b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,14 +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) +find_package(Boost 1.46 COMPONENTS system thread) #=============================================================================== #= Config Header @@ -80,29 +80,32 @@ 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/dialogs/about.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 ) set(pulseview_HEADERS - pv/about.h pv/mainwindow.h pv/samplingbar.h pv/sigsession.h + pv/dialogs/about.h pv/view/cursor.h pv/view/header.h pv/view/ruler.h @@ -112,7 +115,7 @@ set(pulseview_HEADERS ) set(pulseview_FORMS - pv/about.ui + pv/dialogs/about.ui ) set(pulseview_RESOURCES