Skip to content
This repository has been archived by the owner on Oct 27, 2020. It is now read-only.
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: azonenberg/scopehal-cmake
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 52dfea36cecf
Choose a base ref
...
head repository: azonenberg/scopehal-cmake
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 8d90c01f0797
Choose a head ref
  • 1 commit
  • 3 files changed
  • 1 contributor

Commits on Jun 1, 2019

  1. Copy the full SHA
    8d90c01 View commit details
Showing with 5 additions and 4 deletions.
  1. +3 −2 CMakeLists.txt
  2. +1 −1 lib
  3. +1 −1 src
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -18,8 +18,9 @@ add_subdirectory("${PROJECT_SOURCE_DIR}/lib/scopemeasurements")
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/xptools")
add_subdirectory("${PROJECT_SOURCE_DIR}/lib/log")
add_subdirectory("${PROJECT_SOURCE_DIR}/src/glscopeclient")
add_subdirectory("${PROJECT_SOURCE_DIR}/src/curvetrace")
#add_subdirectory("${PROJECT_SOURCE_DIR}/src/fgtest")
add_subdirectory("${PROJECT_SOURCE_DIR}/src/examples/curvetrace")
add_subdirectory("${PROJECT_SOURCE_DIR}/src/examples/freqresp")
#add_subdirectory("${PROJECT_SOURCE_DIR}/src/examples/fgtest")

set_property(TARGET scopehal PROPERTY POSITION_INDEPENDENT_CODE ON)
set_property(TARGET log PROPERTY POSITION_INDEPENDENT_CODE ON)
2 changes: 1 addition & 1 deletion lib
Submodule lib updated from 87e95b to a3b46a
2 changes: 1 addition & 1 deletion src
Submodule src updated from 3197fc to 88bb36