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: 9f01ce706d02
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 66971d5cc245
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Dec 19, 2020

  1. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    66971d5 View commit details
Showing with 16 additions and 2 deletions.
  1. +13 −2 scopehal/CMakeLists.txt
  2. +1 −0 scopehal/config.h.in
  3. +2 −0 scopehal/scopehal.h
15 changes: 13 additions & 2 deletions scopehal/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -16,6 +16,12 @@ else()
set(LXI_LIBRARIES "")
endif()

if(OpenCL_FOUND)
set(HAVE_OPENCL 1)
else()
set(HAVE_OPENCL 0)
endif()

set(SCOPEHAL_SOURCES
base64.cpp
scopehal.cpp
@@ -79,14 +85,19 @@ set(SCOPEHAL_SOURCES
TestWaveformSource.cpp
)

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} ${LIBFFTS_LIBRARIES})
${LXI_LIBRARIES} ${WIN_LIBS} ${LIBFFTS_LIBRARIES} ${OpenCL_LIBRARIES} )

target_include_directories(scopehal
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
${LIBFFTS_INCLUDE_DIR})
${CMAKE_CURRENT_BINARY_DIR}
${LIBFFTS_INCLUDE_DIR}
${OpenCL_INCLUDE_DIRS}
)

if(${HAS_LXI})
target_compile_definitions(scopehal PUBLIC HAS_LXI)
1 change: 1 addition & 0 deletions scopehal/config.h.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#define HAVE_OPENCL @HAVE_OPENCL@
2 changes: 2 additions & 0 deletions scopehal/scopehal.h
Original file line number Diff line number Diff line change
@@ -53,6 +53,8 @@
#include "../log/log.h"
#include "../graphwidget/Graph.h"

#include "config.h"

#include "Unit.h"
#include "Bijection.h"
#include "IDTable.h"