TraceTreeItem: Separated from RowItem

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 326499f144ef2f1bd237e5fdf8704b0189007fcf..a979be66855d4fdf974ebfb61443573a62268d8a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -207,8 +207,6 @@ set(pulseview_SOURCES
        pv/view/header.cpp
        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/timeitem.cpp
@@ -216,6 +214,8 @@ set(pulseview_SOURCES
        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/viewitempaintparams.cpp
@@ -230,6 +230,7 @@ set(pulseview_SOURCES
        pv/widgets/popup.cpp
        pv/widgets/popuptoolbutton.cpp
        pv/widgets/sweeptimingwidget.cpp
+       pv/widgets/timestampspinbox.cpp
        pv/widgets/wellarray.cpp
 )
 
@@ -264,6 +265,7 @@ set(pulseview_HEADERS
        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
@@ -277,6 +279,7 @@ set(pulseview_HEADERS
        pv/widgets/popup.hpp
        pv/widgets/popuptoolbutton.hpp
        pv/widgets/sweeptimingwidget.hpp
+       pv/widgets/timestampspinbox.hpp
        pv/widgets/wellarray.hpp
 )
 
@@ -322,7 +325,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)
@@ -447,6 +453,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)
 #-------------------------------------------------------------------------------