projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added SigSession::signals_changed signals to indicate when signals are created
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 3b41bff7980c1d1dcd7ba28870d846e42a556d1e..042cdae3cf7e3028853b68647e13031c34a7f757 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-46,18
+46,14
@@
pkg_check_modules(PKGDEPS REQUIRED
libsigrok>=0.2.0
)
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()
# 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 thread)
#===============================================================================
#= Config Header
#===============================================================================
#= Config Header
@@
-88,14
+84,16
@@
set(pulseview_SOURCES
pv/datasnapshot.cpp
pv/logicdata.cpp
pv/logicdatasnapshot.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/mainwindow.cpp
pv/samplingbar.cpp
pv/signaldata.cpp
pv/sigsession.cpp
- pv/
signal
.cpp
+ pv/
view/cursor
.cpp
pv/view/header.cpp
pv/view/header.cpp
+ pv/view/logicsignal.cpp
pv/view/ruler.cpp
pv/view/ruler.cpp
+ pv/view/signal.cpp
+ pv/view/timemarker.cpp
pv/view/view.cpp
pv/view/viewport.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/mainwindow.h
pv/samplingbar.h
pv/sigsession.h
+ pv/view/cursor.h
pv/view/header.h
pv/view/ruler.h
pv/view/header.h
pv/view/ruler.h
+ pv/view/timemarker.h
pv/view/view.h
pv/view/viewport.h
)
pv/view/view.h
pv/view/viewport.h
)
@@
-130,6
+130,7
@@
include(${QT_USE_FILE})
#-------------------------------------------------------------------------------
add_definitions(${QT_DEFINITIONS})
#-------------------------------------------------------------------------------
add_definitions(${QT_DEFINITIONS})
+add_definitions(-Werror -Wall)
#===============================================================================
#= Global Include Directories
#===============================================================================
#= Global Include Directories