projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wrapped sr_dev_inst in a class: pv::DevInst
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 6b8f9fa8317fdb8128cd50772d4ab3dc3937d191..695da5b4c831f0525d82b6c6d519d2dcbb33ef54 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-51,6
+51,12
@@
if(WIN32)
set(ENABLE_SIGNALS FALSE)
endif()
set(ENABLE_SIGNALS FALSE)
endif()
+if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING
+ "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
+ FORCE)
+endif()
+
#===============================================================================
#= Dependencies
#-------------------------------------------------------------------------------
#===============================================================================
#= Dependencies
#-------------------------------------------------------------------------------
@@
-105,8
+111,10
@@
configure_file (
set(pulseview_SOURCES
main.cpp
pv/devicemanager.cpp
set(pulseview_SOURCES
main.cpp
pv/devicemanager.cpp
+ pv/devinst.cpp
pv/mainwindow.cpp
pv/sigsession.cpp
pv/mainwindow.cpp
pv/sigsession.cpp
+ pv/storesession.cpp
pv/data/analog.cpp
pv/data/analogsnapshot.cpp
pv/data/logic.cpp
pv/data/analog.cpp
pv/data/analogsnapshot.cpp
pv/data/logic.cpp
@@
-115,6
+123,7
@@
set(pulseview_SOURCES
pv/data/snapshot.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
pv/data/snapshot.cpp
pv/dialogs/about.cpp
pv/dialogs/connect.cpp
+ pv/dialogs/storeprogress.cpp
pv/popups/deviceoptions.cpp
pv/popups/probes.cpp
pv/prop/bool.cpp
pv/popups/deviceoptions.cpp
pv/popups/probes.cpp
pv/prop/bool.cpp
@@
-144,6
+153,7
@@
set(pulseview_SOURCES
pv/widgets/colourpopup.cpp
pv/widgets/popup.cpp
pv/widgets/popuptoolbutton.cpp
pv/widgets/colourpopup.cpp
pv/widgets/popup.cpp
pv/widgets/popuptoolbutton.cpp
+ pv/widgets/sweeptimingwidget.cpp
pv/widgets/wellarray.cpp
)
pv/widgets/wellarray.cpp
)
@@
-151,8
+161,10
@@
set(pulseview_SOURCES
set(pulseview_HEADERS
pv/mainwindow.h
pv/sigsession.h
set(pulseview_HEADERS
pv/mainwindow.h
pv/sigsession.h
+ pv/storesession.h
pv/dialogs/about.h
pv/dialogs/connect.h
pv/dialogs/about.h
pv/dialogs/connect.h
+ pv/dialogs/storeprogress.h
pv/popups/probes.h
pv/popups/deviceoptions.h
pv/prop/bool.h
pv/popups/probes.h
pv/popups/deviceoptions.h
pv/prop/bool.h
@@
-177,6
+189,7
@@
set(pulseview_HEADERS
pv/widgets/colourpopup.h
pv/widgets/popup.h
pv/widgets/popuptoolbutton.h
pv/widgets/colourpopup.h
pv/widgets/popup.h
pv/widgets/popuptoolbutton.h
+ pv/widgets/sweeptimingwidget.h
pv/widgets/wellarray.h
)
pv/widgets/wellarray.h
)
@@
-198,11
+211,12
@@
if(ENABLE_DECODE)
pv/data/decoderstack.cpp
pv/data/decode/annotation.cpp
pv/data/decode/decoder.cpp
pv/data/decoderstack.cpp
pv/data/decode/annotation.cpp
pv/data/decode/decoder.cpp
+ pv/data/decode/row.cpp
+ pv/data/decode/rowdata.cpp
pv/prop/binding/decoderoptions.cpp
pv/view/decodetrace.cpp
pv/widgets/decodergroupbox.cpp
pv/widgets/decodermenu.cpp
pv/prop/binding/decoderoptions.cpp
pv/view/decodetrace.cpp
pv/widgets/decodergroupbox.cpp
pv/widgets/decodermenu.cpp
- pv/widgets/wellarray.cpp
)
list(APPEND pulseview_HEADERS
)
list(APPEND pulseview_HEADERS
@@
-273,6
+287,10
@@
set(PULSEVIEW_LINK_LIBS
if(STATIC_PKGDEPS_LIBS)
link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS})
list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES})
if(STATIC_PKGDEPS_LIBS)
link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS})
list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES})
+if(WIN32)
+ # Workaround for a MinGW linking issue.
+ list(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2")
+endif()
else()
link_directories(${PKGDEPS_LIBRARY_DIRS})
list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})
else()
link_directories(${PKGDEPS_LIBRARY_DIRS})
list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})