ngscopeclient · May 31, 2021 · May 31, 2021 · May 31, 2021
Showing with 16 additions and 5 deletions.

+3 −0 .gitmodules

+9 −2 scopehal/CMakeLists.txt

+3 −2 scopehal/PeakDetectionFilter.cpp

+1 −1 scopehal/scopehal.h
diff --git a/.gitmodules b/.gitmodules
@@ -7,3 +7,6 @@
 [submodule "graphwidget"]
 	path = graphwidget
 	url = ../graphwidget.git
+[submodule "OpenCL-CLHPP"]
+	path = OpenCL-CLHPP
+	url = https://github.com/KhronosGroup/OpenCL-CLHPP.git
diff --git a/scopehal/CMakeLists.txt b/scopehal/CMakeLists.txt
@@ -2,6 +2,7 @@ include_directories(SYSTEM ${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS})
 link_directories(${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})
 
 find_library(LXI_LIB lxi)
+find_package(Yaml REQUIRED)
 
 # Additional Windows/Linux libraries
 if(WIN32)
@@ -10,6 +11,11 @@ else()
 	set(LIN_LIBS dl)
 endif()
 
+# Apple has their own idea about stat structs
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dst_mtim=st_mtimespec")
+endif()
+
 if(LXI_LIB)
 	set(HAS_LXI true)
 	set(LXI_LIBRARIES ${LXI_LIB})
@@ -104,15 +110,16 @@ configure_file(config.h.in config.h)
 
 add_library(scopehal SHARED
 	${SCOPEHAL_SOURCES})
-target_link_libraries(scopehal ${SIGCXX_LIBRARIES} ${GTKMM_LIBRARIES} xptools log graphwidget yaml-cpp
-	${LXI_LIBRARIES} ${WIN_LIBS} ${LIN_LIBS} ${LIBFFTS_LIBRARIES} ${OpenCL_LIBRARIES} ${CLFFT_LIBRARIES})
+target_link_libraries(scopehal ${SIGCXX_LIBRARIES} ${GTKMM_LIBRARIES} xptools log graphwidget ${YAML_LIBRARIES}
+	${LXI_LIBRARIES} ${WIN_LIBS} ${LIN_LIBS} ${LIBFFTS_LIBRARIES} ${OpenCL_LIBRARIES} ${CLFFT_LIBRARIES} ${OpenMP_CXX_LIBRARIES})
 
 target_include_directories(scopehal
 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
 	${CMAKE_CURRENT_BINARY_DIR}
 	${LIBFFTS_INCLUDE_DIR}
 	${OpenCL_INCLUDE_DIR}
 	${CLFFT_INCLUDE_DIR}
+	${YAML_INCLUDES}
 	)
 
 if(${HAS_LXI})

diff --git a/scopehal/PeakDetectionFilter.cpp b/scopehal/PeakDetectionFilter.cpp
@@ -64,8 +64,9 @@ void PeakDetector::FindPeaks(AnalogWaveform* cap, int64_t max_peaks, float searc
 		for(ssize_t i=minpeak; i<(ssize_t)nouts; i++)
 		{
 			//Locate the peak
-			ssize_t left = max((ssize_t)minpeak, i - search_rad);
-			ssize_t right = min(i + search_rad, (ssize_t)nend);
+			ssize_t left = max((ssize_t)minpeak, (ssize_t)(i - search_rad));
+			ssize_t right = min((ssize_t)(i + search_rad), (ssize_t)nend);
+
 			float target = cap->m_samples[i];
 			bool is_peak = true;
 			for(ssize_t j=left; j<=right; j++)

diff --git a/scopehal/scopehal.h b/scopehal/scopehal.h
@@ -60,7 +60,7 @@
 #define CL_HPP_TARGET_OPENCL_VERSION CL_TARGET_OPENCL_VERSION
 #define CL_HPP_ENABLE_PROGRAM_CONSTRUCTION_FROM_ARRAY_COMPATIBILITY
 #define CL_HPP_ENABLE_EXCEPTIONS
-#include <CL/cl2.hpp>
+#include "../OpenCL-CLHPP/include/CL/opencl.hpp"
 #endif
 
 #include "Unit.h"