projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #1132 by passing segment IDs, not segment instances
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index db839d085be0513f1f41138b4672c7cfd81d7f90..c8b4d6ad08740a1d9404db304e9d182bff80cf25 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-58,10
+58,10
@@
endif()
list(APPEND PKGDEPS glib-2.0>=2.28.0)
list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
list(APPEND PKGDEPS glib-2.0>=2.28.0)
list(APPEND PKGDEPS glibmm-2.4>=2.28.0)
-list(APPEND PKGDEPS libsigrokcxx>=0.
5
.0)
+list(APPEND PKGDEPS libsigrokcxx>=0.
6
.0)
if(ENABLE_DECODE)
if(ENABLE_DECODE)
- list(APPEND PKGDEPS libsigrokdecode>=0.
5
.0)
+ list(APPEND PKGDEPS libsigrokdecode>=0.
6
.0)
endif()
if(ANDROID)
endif()
if(ANDROID)
@@
-153,7
+153,7
@@
memaccess_check_unaligned_le(HAVE_UNALIGNED_LITTLE_ENDIAN_ACCESS)
#-------------------------------------------------------------------------------
set(PV_TITLE PulseView)
#-------------------------------------------------------------------------------
set(PV_TITLE PulseView)
-set(PV_VERSION_STRING "0.
4
.0")
+set(PV_VERSION_STRING "0.
5
.0")
set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION})
set(PV_GLIBMM_VERSION ${PKGDEPS_glibmm-2.4_VERSION})
@@
-234,7
+234,6
@@
set(pulseview_SOURCES
pv/views/trace/rowitem.cpp
pv/views/trace/ruler.cpp
pv/views/trace/signal.cpp
pv/views/trace/rowitem.cpp
pv/views/trace/ruler.cpp
pv/views/trace/signal.cpp
- pv/views/trace/signalscalehandle.cpp
pv/views/trace/timeitem.cpp
pv/views/trace/timemarker.cpp
pv/views/trace/trace.cpp
pv/views/trace/timeitem.cpp
pv/views/trace/timemarker.cpp
pv/views/trace/trace.cpp
@@
-297,7
+296,6
@@
set(pulseview_HEADERS
pv/views/trace/rowitem.hpp
pv/views/trace/ruler.hpp
pv/views/trace/signal.hpp
pv/views/trace/rowitem.hpp
pv/views/trace/ruler.hpp
pv/views/trace/signal.hpp
- pv/views/trace/signalscalehandle.hpp
pv/views/trace/timeitem.hpp
pv/views/trace/timemarker.hpp
pv/views/trace/trace.hpp
pv/views/trace/timeitem.hpp
pv/views/trace/timemarker.hpp
pv/views/trace/trace.hpp
@@
-334,7
+332,7
@@
endif()
if(ENABLE_DECODE)
list(APPEND pulseview_SOURCES
pv/binding/decoder.cpp
if(ENABLE_DECODE)
list(APPEND pulseview_SOURCES
pv/binding/decoder.cpp
- pv/data/decode
rstack
.cpp
+ pv/data/decode
signal
.cpp
pv/data/decode/annotation.cpp
pv/data/decode/decoder.cpp
pv/data/decode/row.cpp
pv/data/decode/annotation.cpp
pv/data/decode/decoder.cpp
pv/data/decode/row.cpp
@@
-345,7
+343,7
@@
if(ENABLE_DECODE)
)
list(APPEND pulseview_HEADERS
)
list(APPEND pulseview_HEADERS
- pv/data/decode
rstack
.hpp
+ pv/data/decode
signal
.hpp
pv/views/trace/decodetrace.hpp
pv/widgets/decodergroupbox.hpp
pv/widgets/decodermenu.hpp
pv/views/trace/decodetrace.hpp
pv/widgets/decodergroupbox.hpp
pv/widgets/decodermenu.hpp
@@
-450,7
+448,7
@@
endif()
target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
-if(WIN32)
+if(WIN32
AND NOT ${CMAKE_BUILD_TYPE} STREQUAL "Debug"
)
# Pass -mwindows so that no "DOS box" opens when PulseView is started.
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
endif()
# Pass -mwindows so that no "DOS box" opens when PulseView is started.
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows")
endif()
@@
-471,6
+469,10
@@
install(FILES contrib/org.sigrok.PulseView.desktop DESTINATION ${CMAKE_INSTALL_D
# Install the AppData/AppStream file.
install(FILES contrib/org.sigrok.PulseView.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
# Install the AppData/AppStream file.
install(FILES contrib/org.sigrok.PulseView.appdata.xml DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo)
+# Install the PulseView icons.
+install(FILES icons/pulseview.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/48x48/apps)
+install(FILES icons/pulseview.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps)
+
# Generate Windows installer script.
configure_file(contrib/pulseview_cross.nsi.in contrib/pulseview_cross.nsi @ONLY)
# Generate Windows installer script.
configure_file(contrib/pulseview_cross.nsi.in contrib/pulseview_cross.nsi @ONLY)