X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=1e1716b7f512cacbf6ddd3a2199d80fef3ca5d72;hp=a54708e3f61a8c9079dff7a3bda7e285b03a0cb2;hb=ab1d13eefe929b466699eac93d173f45d59e60fd;hpb=38935007e7feb384119af3a07f1ad5452e6de5ff diff --git a/CMakeLists.txt b/CMakeLists.txt index a54708e3..1e1716b7 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 @@ -84,35 +80,47 @@ configure_file ( set(pulseview_SOURCES main.cpp - pv/about.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/data/analog.cpp + pv/data/analogsnapshot.cpp + pv/data/logic.cpp + pv/data/logicsnapshot.cpp + pv/data/signaldata.cpp + pv/data/snapshot.cpp + pv/dialogs/about.cpp + pv/dialogs/hwcap.cpp + pv/prop/enum.cpp + pv/prop/property.cpp + pv/prop/binding/binding.cpp + pv/prop/binding/hwcap.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 + pv/view/timemarker.h pv/view/view.h pv/view/viewport.h ) set(pulseview_FORMS - pv/about.ui + pv/dialogs/about.ui ) set(pulseview_RESOURCES