projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
TraceView: Center traces vertically after view creation
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 69e62ee5e4dd3bed6757c1e20a1a3756ab66c377..ee58ce2cd6b335f00e272dc172ee79f50ab2b2d5 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-97,11
+97,11
@@
else()
find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
endif()
find_package(Qt4 REQUIRED QtCore QtGui QtSvg)
endif()
+set(BOOSTCOMPS filesystem serialization system thread)
if(ENABLE_TESTS)
if(ENABLE_TESTS)
- find_package(Boost 1.53 COMPONENTS filesystem serialization system thread unit_test_framework REQUIRED)
-else()
- find_package(Boost 1.53 COMPONENTS filesystem serialization system thread REQUIRED)
+ list(APPEND BOOSTCOMPS unit_test_framework)
endif()
endif()
+find_package(Boost 1.55 COMPONENTS ${BOOSTCOMPS} REQUIRED)
# Find the platform's thread library (needed for C++11 threads).
# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
# Find the platform's thread library (needed for C++11 threads).
# This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value.
@@
-262,6
+262,8
@@
set(pulseview_SOURCES
pv/view/viewitempaintparams.cpp
pv/view/viewport.cpp
pv/view/viewwidget.cpp
pv/view/viewitempaintparams.cpp
pv/view/viewport.cpp
pv/view/viewwidget.cpp
+ pv/views/viewbase.cpp
+ pv/views/trace/standardbar.cpp
pv/widgets/colourbutton.cpp
pv/widgets/colourpopup.cpp
pv/widgets/devicetoolbutton.cpp
pv/widgets/colourbutton.cpp
pv/widgets/colourpopup.cpp
pv/widgets/devicetoolbutton.cpp
@@
-314,6
+316,8
@@
set(pulseview_HEADERS
pv/view/viewitem.hpp
pv/view/viewport.hpp
pv/view/viewwidget.hpp
pv/view/viewitem.hpp
pv/view/viewport.hpp
pv/view/viewwidget.hpp
+ pv/views/viewbase.hpp
+ pv/views/trace/standardbar.hpp
pv/widgets/colourbutton.hpp
pv/widgets/colourpopup.hpp
pv/widgets/devicetoolbutton.hpp
pv/widgets/colourbutton.hpp
pv/widgets/colourpopup.hpp
pv/widgets/devicetoolbutton.hpp
@@
-396,6
+400,7
@@
add_definitions(${QT_DEFINITIONS} -DQT_NO_KEYWORDS)
add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-Wall -Wextra)
add_definitions(-std=c++11)
add_definitions(-D__STDC_LIMIT_MACROS)
add_definitions(-Wall -Wextra)
add_definitions(-std=c++11)
+add_definitions(-DBOOST_MATH_DISABLE_FLOAT128=1)
if(ENABLE_DECODE)
add_definitions(-DENABLE_DECODE)
if(ENABLE_DECODE)
add_definitions(-DENABLE_DECODE)