X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=CMakeLists.txt;h=be2cd14e80129d70a9b7973f7f932c63e90eb1be;hp=bde27c13c900b9c8096d712c1738cf83569042cd;hb=dddff2e7c658aa84f67186ade0a4845b5fb0b43f;hpb=806d3e1eb3d60e93ff95d23e79588a0486730967 diff --git a/CMakeLists.txt b/CMakeLists.txt index bde27c13..be2cd14e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -324,7 +324,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 +452,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) #-------------------------------------------------------------------------------