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: f3000bf60d31
Choose a base ref
...
head repository: ngscopeclient/scopehal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: eac3c7d24a69
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on May 12, 2021

  1. change system includes to SYSTEM to hide their warnings

    @xzcvczx
    xzcvczx committed May 12, 2021
    Copy the full SHA
    3d7dfc5 View commit details

  2. Merge pull request #477 from xzcvczx/system-includes 

    change system includes to SYSTEM to hide their warnings
    @azonenberg
    azonenberg authored May 12, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    eac3c7d View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 scopehal/CMakeLists.txt
  2. +1 −1 scopeprotocols/CMakeLists.txt
2 changes: 1 addition & 1 deletion scopehal/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include_directories(${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS})
include_directories(SYSTEM ${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS})
link_directories(${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})

find_library(LXI_LIB lxi)
2 changes: 1 addition & 1 deletion scopeprotocols/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include_directories(${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS})
include_directories(SYSTEM ${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS})
link_directories(${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})

set(SCOPEPROTOCOLS_SOURCES