X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=1e1716b7f512cacbf6ddd3a2199d80fef3ca5d72;hp=812176ec6e8b52d17e1729c23d8e9beadbd82e77;hb=2a032dcb6151bd8b019c88f6ef1db1a8c1e5b61e;hpb=8d634081d8b0cc741dd34d8c646474ff6754aea8 diff --git a/CMakeLists.txt b/CMakeLists.txt index 812176ec..1e1716b7 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,14 +80,22 @@ configure_file ( set(pulseview_SOURCES main.cpp - pv/about.cpp - pv/datasnapshot.cpp - pv/logicdata.cpp - pv/logicdatasnapshot.cpp pv/mainwindow.cpp pv/samplingbar.cpp - pv/signaldata.cpp pv/sigsession.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 @@ -99,10 +107,10 @@ set(pulseview_SOURCES ) 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 +120,7 @@ set(pulseview_HEADERS ) set(pulseview_FORMS - pv/about.ui + pv/dialogs/about.ui ) set(pulseview_RESOURCES