X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=caf2eac3fedc3a063068ebdfb2b8f4c6808d7045;hp=bde27c13c900b9c8096d712c1738cf83569042cd;hb=8a2fafcc1401c4021ee700cc932ef34d6c795941;hpb=806d3e1eb3d60e93ff95d23e79588a0486730967 diff --git a/CMakeLists.txt b/CMakeLists.txt index bde27c13..caf2eac3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,16 +208,19 @@ set(pulseview_SOURCES pv/view/marginwidget.cpp pv/view/logicsignal.cpp pv/view/rowitem.cpp - pv/view/rowitemowner.cpp pv/view/ruler.cpp pv/view/signal.cpp + pv/view/signalscalehandle.cpp pv/view/timeitem.cpp pv/view/timemarker.cpp pv/view/trace.cpp pv/view/tracegroup.cpp pv/view/tracepalette.cpp + pv/view/tracetreeitem.cpp + pv/view/tracetreeitemowner.cpp pv/view/view.cpp pv/view/viewitem.cpp + pv/view/viewitemowner.cpp pv/view/viewitempaintparams.cpp pv/view/viewport.cpp pv/view/viewwidget.cpp @@ -261,10 +264,12 @@ set(pulseview_HEADERS pv/view/rowitem.hpp pv/view/ruler.hpp pv/view/signal.hpp + pv/view/signalscalehandle.hpp pv/view/timeitem.hpp pv/view/timemarker.hpp pv/view/trace.hpp pv/view/tracegroup.hpp + pv/view/tracetreeitem.hpp pv/view/view.hpp pv/view/viewitem.hpp pv/view/viewport.hpp @@ -324,7 +329,10 @@ if(WIN32) endif() if(ANDROID) - list(APPEND pulseview_SOURCES android/loghandler.cpp) + list(APPEND pulseview_SOURCES + android/assetreader.cpp + android/loghandler.cpp + ) endif() if(Qt5Core_FOUND) @@ -449,6 +457,9 @@ install(TARGETS ${PROJECT_NAME} DESTINATION bin/) # Install the manpage. install(FILES doc/pulseview.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 COMPONENT doc) +# Generate Windows installer script. +configure_file(contrib/pulseview_cross.nsi.in contrib/pulseview_cross.nsi @ONLY) + #=============================================================================== #= Packaging (handled by CPack) #-------------------------------------------------------------------------------