projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved default device selection into MainWindow
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 99314d05e8213fc9bb1e95c92fa568836169b37c..049c955ec76400ee6df04009e7c11b2102a2265e 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-155,8
+155,14
@@
set(pulseview_SOURCES
pv/data/logicsegment.cpp
pv/data/signaldata.cpp
pv/data/segment.cpp
pv/data/logicsegment.cpp
pv/data/signaldata.cpp
pv/data/segment.cpp
+ pv/devices/device.cpp
+ pv/devices/file.cpp
+ pv/devices/hardwaredevice.cpp
+ pv/devices/inputfile.cpp
+ pv/devices/sessionfile.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
+ pv/dialogs/inputoutputoptions.cpp
pv/dialogs/storeprogress.cpp
pv/popups/deviceoptions.cpp
pv/popups/channels.cpp
pv/dialogs/storeprogress.cpp
pv/popups/deviceoptions.cpp
pv/popups/channels.cpp
@@
-193,6
+199,7
@@
set(pulseview_SOURCES
pv/widgets/devicetoolbutton.cpp
pv/widgets/exportmenu.cpp
pv/widgets/hidingmenubar.cpp
pv/widgets/devicetoolbutton.cpp
pv/widgets/exportmenu.cpp
pv/widgets/hidingmenubar.cpp
+ pv/widgets/importmenu.cpp
pv/widgets/popup.cpp
pv/widgets/popuptoolbutton.cpp
pv/widgets/sweeptimingwidget.cpp
pv/widgets/popup.cpp
pv/widgets/popuptoolbutton.cpp
pv/widgets/sweeptimingwidget.cpp
@@
-207,6
+214,7
@@
set(pulseview_HEADERS
pv/binding/device.hpp
pv/dialogs/about.hpp
pv/dialogs/connect.hpp
pv/binding/device.hpp
pv/dialogs/about.hpp
pv/dialogs/connect.hpp
+ pv/dialogs/inputoutputoptions.hpp
pv/dialogs/storeprogress.hpp
pv/popups/channels.hpp
pv/popups/deviceoptions.hpp
pv/dialogs/storeprogress.hpp
pv/popups/channels.hpp
pv/popups/deviceoptions.hpp
@@
-238,6
+246,7
@@
set(pulseview_HEADERS
pv/widgets/devicetoolbutton.hpp
pv/widgets/exportmenu.hpp
pv/widgets/hidingmenubar.hpp
pv/widgets/devicetoolbutton.hpp
pv/widgets/exportmenu.hpp
pv/widgets/hidingmenubar.hpp
+ pv/widgets/importmenu.hpp
pv/widgets/popup.hpp
pv/widgets/popuptoolbutton.hpp
pv/widgets/sweeptimingwidget.hpp
pv/widgets/popup.hpp
pv/widgets/popuptoolbutton.hpp
pv/widgets/sweeptimingwidget.hpp
@@
-294,7
+303,10
@@
if(Qt5Core_FOUND)
qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
else()
qt5_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
qt5_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
else()
- qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS})
+ # Workaroud for QTBUG-22829: -DBOOST_NEXT_PRIOR_HPP_INCLUDED.
+ # https://bugreports.qt.io/browse/QTBUG-22829
+ qt4_wrap_cpp(pulseview_HEADERS_MOC ${pulseview_HEADERS}
+ OPTIONS -DBOOST_NEXT_PRIOR_HPP_INCLUDED)
qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
include(${QT_USE_FILE})
qt4_wrap_ui(pulseview_FORMS_HEADERS ${pulseview_FORMS})
qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
include(${QT_USE_FILE})