Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b46450c10ac8
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b695cd3fcf49
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 31, 2021

  1. Disable warning spam in opencl.hpp

    @azonenberg
    azonenberg committed May 31, 2021
    Copy the full SHA
    b695cd3 View commit details
Showing with 12 additions and 2 deletions.
  1. +6 −1 scopehal/CMakeLists.txt
  2. +6 −1 scopehal/scopehal.h
7 changes: 6 additions & 1 deletion scopehal/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -114,14 +114,19 @@ target_link_libraries(scopehal ${SIGCXX_LIBRARIES} ${GTKMM_LIBRARIES} xptools lo
${LXI_LIBRARIES} ${WIN_LIBS} ${LIN_LIBS} ${LIBFFTS_LIBRARIES} ${OpenCL_LIBRARIES} ${CLFFT_LIBRARIES} ${OpenMP_CXX_LIBRARIES})

target_include_directories(scopehal
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${LIBFFTS_INCLUDE_DIR}
${OpenCL_INCLUDE_DIR}
${CLFFT_INCLUDE_DIR}
${YAML_INCLUDES}
)

target_include_directories(scopehal
PUBLIC SYSTEM
${CMAKE_CURRENT_SOURCE_DIR}/../OpenCL-CLHPP/include)

if(${HAS_LXI})
target_compile_definitions(scopehal PUBLIC HAS_LXI)
endif()
7 changes: 6 additions & 1 deletion scopehal/scopehal.h
View file
Original file line number Diff line number Diff line change
@@ -60,7 +60,12 @@
#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 "../OpenCL-CLHPP/include/CL/opencl.hpp"
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
#pragma GCC diagnostic ignored "-Wignored-attributes"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#include <CL/opencl.hpp>
#pragma GCC diagnostic pop
#endif

#include "Unit.h"