projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SweepTimingWidget: When the exact value isn't available try to set a close match
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 94d32a41f1d53e6b892f81c6150f57b106bebba6..edac86111c77c4f256096afd98a694a55ea64450 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,6
+111,7
@@
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/storesession.cpp
pv/mainwindow.cpp
pv/sigsession.cpp
pv/storesession.cpp
@@
-146,11
+153,13
@@
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
)
# This list includes only QObject derived class headers.
set(pulseview_HEADERS
pv/widgets/wellarray.cpp
)
# This list includes only QObject derived class headers.
set(pulseview_HEADERS
+ pv/devinst.h
pv/mainwindow.h
pv/sigsession.h
pv/storesession.h
pv/mainwindow.h
pv/sigsession.h
pv/storesession.h
@@
-181,6
+190,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
)
@@
-202,11
+212,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
@@
-277,6
+288,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})