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: 825ce3b82702
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: 6a0dfa800351
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on May 24, 2020

  1. Update README.md

    @x44203
    x44203 authored May 24, 2020

    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
    10da893 View commit details

  2. Update README.md

    @x44203
    x44203 authored May 24, 2020

    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
    a0e46d9 View commit details

  3. Merge pull request #11 from x44203/patch-1 

    Readme with installation instructions
    @azonenberg
    azonenberg authored May 24, 2020

    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
    6a0dfa8 View commit details
Showing with 28 additions and 0 deletions.
  1. +28 −0 README.md
28 changes: 28 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,31 @@
# scopehal-cmake
CMake build wrapper for scopehal and scopehal-apps

## Installation
Install dependencies on ubuntu with
```
sudo apt-get install build-essential cmake pkg-config libglm-dev libgtkmm-3.0-dev libsigc++-2.0-dev libyaml-cpp-dev
```

Install FFTS library
```
git clone https://github.com/anthonix/ffts.git
cd ffts
mkdir build
cd build
cmake ../
make
sudo make install
```

Build scopehal and scopehal-apps
```
git clone https://github.com/azonenberg/scopehal-cmake.git --recurse-submodules
cd scopehal-cmake
mkdir build
cd build
cmake ../
make
```

The executable is found unter `build/src/glscopeclient/glscopeclient` and the manual under `build/doc/glscopeclient-manual.pdf`