DecodeSignal: Use name of last stacked PD unless the name was changed

[pulseview.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd0ac5cf0c5b5bca45e43b1891636d1eb3136ac6..b6c88f4f640c37ffea1b972b0c39f956ab8c4156 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -266,6 +266,7 @@ set(pulseview_SOURCES
        pv/prop/int.cpp
        pv/prop/property.cpp
        pv/prop/string.cpp
+       pv/subwindows/subwindowbase.cpp
        pv/toolbars/mainbar.cpp
        pv/views/trace/analogsignal.cpp
        pv/views/trace/cursor.cpp
@@ -330,6 +331,7 @@ set(pulseview_HEADERS
        pv/prop/int.hpp
        pv/prop/property.hpp
        pv/prop/string.hpp
+       pv/subwindows/subwindowbase.hpp
        pv/toolbars/mainbar.hpp
        pv/views/trace/analogsignal.hpp
        pv/views/trace/cursor.hpp
@@ -381,6 +383,9 @@ if(ENABLE_DECODE)
                pv/data/decode/decoder.cpp
                pv/data/decode/row.cpp
                pv/data/decode/rowdata.cpp
+               pv/subwindows/decoder_selector/item.cpp
+               pv/subwindows/decoder_selector/model.cpp
+               pv/subwindows/decoder_selector/subwindow.cpp
                pv/views/trace/decodetrace.cpp
                pv/widgets/decodergroupbox.cpp
                pv/widgets/decodermenu.cpp
@@ -388,6 +393,7 @@ if(ENABLE_DECODE)
 
        list(APPEND pulseview_HEADERS
                pv/data/decodesignal.hpp
+               pv/subwindows/decoder_selector/subwindow.hpp
                pv/views/trace/decodetrace.hpp
                pv/widgets/decodergroupbox.hpp
                pv/widgets/decodermenu.hpp
@@ -534,7 +540,7 @@ install(FILES icons/pulseview.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons
 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)
+configure_file(contrib/pulseview_cross.nsi.in ${CMAKE_CURRENT_BINARY_DIR}/contrib/pulseview_cross.nsi @ONLY)
 
 #===============================================================================
 #= Packaging (handled by CPack)