projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: Introduce string tokenize helper routine
[pulseview.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index db839d085be0513f1f41138b4672c7cfd81d7f90..ca4142c481afd7b478201ae8f343b2d2debf9579 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-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})
@@
-471,6
+471,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)