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-apps
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 29a5860cbcf5
Choose a base ref
...
head repository: ngscopeclient/scopehal-apps
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1824351d5521
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on May 24, 2020

  1. glscopeclient: removed all references to libscopemeasurements as it n… 

    …o longer exists
    @azonenberg
    azonenberg committed May 24, 2020
    Copy the full SHA
    1824351 View commit details
Showing with 0 additions and 3 deletions.
  1. +0 −1 glscopeclient/CMakeLists.txt
  2. +0 −2 glscopeclient/main.cpp
1 change: 0 additions & 1 deletion glscopeclient/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,6 @@ add_executable(glscopeclient
target_link_libraries(glscopeclient
scopehal
scopeprotocols
scopemeasurements
${GTKMM_LIBRARIES}
${SIGCXX_LIBRARIES}
GL
2 changes: 0 additions & 2 deletions glscopeclient/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -35,7 +35,6 @@

#include "glscopeclient.h"
#include "../scopeprotocols/scopeprotocols.h"
#include "../scopemeasurements/scopemeasurements.h"
#include "../scopehal/SiglentSCPIOscilloscope.h"
#include "../scopehal/AgilentOscilloscope.h"
#include "../scopehal/LeCroyOscilloscope.h"
@@ -152,7 +151,6 @@ int main(int argc, char* argv[])
TransportStaticInit();
DriverStaticInit();
ScopeProtocolStaticInit();
ScopeMeasurementStaticInit();

//Initialize object creation tables for plugins
InitializePlugins();