Updated to latest scopehal

ngscopeclient · Aug 29, 2024 · 0f48d10 · 0f48d10
1 parent e5e6daa
commit 0f48d10
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/doc b/doc
diff --git a/lib b/lib
diff --git a/src/ngscopeclient/CMakeLists.txt b/src/ngscopeclient/CMakeLists.txt
@@ -142,31 +142,22 @@ add_custom_target(
 add_dependencies(nghalshaders
 	halshaders)
 
+add_custom_target(
+	ngchannels
+	COMMENT "Copying channels..."
+	COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/lib/scopehal/channels ${CMAKE_BINARY_DIR}/src/ngscopeclient/channels)
+
 add_dependencies(ngscopeclient
 	ngfonts
 	ngicons
 	ngrendershaders
 	ngprotoshaders
 	nghalshaders
+	ngchannels
 	)
 
 add_subdirectory(shaders)
 
-# implot has a bunch of warnings, turn them off to avoid cluttering the build
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  set_source_files_properties(
-	../implot/implot.cpp
-	../implot/implot_demo.cpp
-	../implot/implot_items.cpp
-	PROPERTIES COMPILE_FLAGS -Wno-missing-declarations)
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
-  set_source_files_properties(
-	../implot/implot.cpp
-	../implot/implot_demo.cpp
-	../implot/implot_items.cpp
-	PROPERTIES COMPILE_FLAGS -Wno-missing-declarations)
-endif()
-
 ###############################################################################
 #Set up include paths
 target_include_directories(ngscopeclient
+2 −0		scopehal/CMakeLists.txt
+1 −1		scopehal/DemoOscilloscope.cpp
+34 −15		scopehal/TestWaveformSource.cpp
+4 −2		scopehal/TestWaveformSource.h
+93 −0		scopehal/channels/300mm-s2000m.s2p
+1 −0		scopeprotocols/CMakeLists.txt
+306 −0		scopeprotocols/J1939PDUDecoder.cpp
+93 −0		scopeprotocols/J1939PDUDecoder.h
+1 −0		scopeprotocols/scopeprotocols.cpp
+1 −0		scopeprotocols/scopeprotocols.h