X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=31164a9e77c2b8336fa7b0032d8c45227057f9b8;hb=6202cf13abc361af4d1419dc56eaabc314900692;hp=38252fddecfb024745f801aaf4673dc0df66f3ce;hpb=989d50ad39d030bcb5df3869ec9b94d6a9e878d9;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38252fdd..31164a9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -389,8 +389,8 @@ if(ENABLE_DECODE)
 		pv/subwindows/decoder_selector/item.cpp
 		pv/subwindows/decoder_selector/model.cpp
 		pv/subwindows/decoder_selector/subwindow.cpp
-		pv/views/decoder_output/view.cpp
-		pv/views/decoder_output/QHexView.cpp
+		pv/views/decoder_binary/view.cpp
+		pv/views/decoder_binary/QHexView.cpp
 		pv/views/trace/decodetrace.cpp
 		pv/widgets/decodergroupbox.cpp
 		pv/widgets/decodermenu.cpp
@@ -399,8 +399,8 @@ if(ENABLE_DECODE)
 	list(APPEND pulseview_HEADERS
 		pv/data/decodesignal.hpp
 		pv/subwindows/decoder_selector/subwindow.hpp
-		pv/views/decoder_output/view.hpp
-		pv/views/decoder_output/QHexView.hpp
+		pv/views/decoder_binary/view.hpp
+		pv/views/decoder_binary/QHexView.hpp
 		pv/views/trace/decodetrace.hpp
 		pv/widgets/decodergroupbox.hpp
 		pv/widgets/decodermenu.hpp
@@ -528,10 +528,11 @@ if(ANDROID)
 	list(APPEND PULSEVIEW_LINK_LIBS "-llog")
 endif()
 
+set(INPUT_FILES_LIST ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC} ${QM_FILES})
 if(ANDROID)
-	add_library(${PROJECT_NAME} SHARED ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC} ${QM_FILES})
+	add_library(${PROJECT_NAME} SHARED ${INPUT_FILES_LIST})
 else()
-	add_executable(${PROJECT_NAME} ${pulseview_SOURCES} ${pulseview_RESOURCES_RCC} ${QM_FILES})
+	add_executable(${PROJECT_NAME} ${INPUT_FILES_LIST})
 endif()
 
 target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})