Skip to content

Commit faf3e11

Browse files
authored
Merge pull request #952 from tomverbeure/compilation_instructions
Link to compilation instructions in the HTLM manual.
2 parents 8d79ca1 + 84b9924 commit faf3e11

1 file changed

Lines changed: 45 additions & 1 deletion

File tree

README.md

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,56 @@ Project website: [https://www.ngscopeclient.org](https://www.ngscopeclient.org)
1010
* [Code of Conduct](https://github.com/ngscopeclient/scopehal-apps/blob/master/CODE_OF_CONDUCT.md)
1111
* We are a proudly AI-free project. Only human created code is acceptable for contribution.
1212

13-
## Installation
13+
## Installation
1414

1515
Refer to the "getting started" chapter of the User manual
1616
* [User manual GettingStarted (HTML)](https://www.ngscopeclient.org/manual/GettingStarted.html)
1717
* [User manual (PDF)](https://www.ngscopeclient.org/downloads/ngscopeclient-manual.pdf)
1818

19+
## Compilation instructions (Linux,macOS,Windows)
20+
21+
* [User manual Compilation (HTML)](https://www.ngscopeclient.org/manual/GettingStarted.html#compilation)
22+
23+
## Compiling a forked repo
24+
25+
If you want to contribute changes to scopehal-apps, you should make them in a
26+
forked repo so that you can create pull request with your changes.
27+
28+
Following these steps:
29+
30+
* Fork a bunch of GitHub repos to your own GitHub account
31+
32+
Right now, the build system requires that your GitHub account has cloned version of the
33+
VkFFT, xptools and logtools. It's best to clone the version that under the ngscopeclient
34+
account, this ensure that you're working with the same version as the core development
35+
team.
36+
37+
* [ngscopeclient/VkFFT](https://github.com/ngscopeclient/VkFFT)
38+
* [ngscopeclient/xptools](https://github.com/ngscopeclient/xptools)
39+
* [ngscopeclient/logtools](https://github.com/ngscopeclient/logtools)
40+
41+
* Fork the `scopehal-apps` repo (this one!) to your own account
42+
* Clone your personal repo to your development machine
43+
44+
`git clone --recursive git@github.com:<your github username>/scopehal-apps.git scopehal-apps`
45+
46+
* Follow the regular compilation instructions.
47+
48+
If you want to create executables with debug symbols, make sure to change option `MAKE_BUILD_TYPE`
49+
from `Release` to `Debug` when running `cmake`.
50+
51+
It is possible that `cmake` errors out with the following error message:
52+
53+
```
54+
CMake Error at CMakeLists.txt:82 (message):
55+
Unrecognized version tag 53152c7c / 53152c7c, can't create a VERSIONINFO
56+
from it. Must be of format v1.2, v1.2.3, v1.2-rc3, v1.2.3-rc4
57+
```
58+
59+
You can fix this by creating a dummy tag in your local repo:
60+
61+
`git tag v0.0.0`
62+
1963
## Special comments
2064

2165
The following standard comments are used throughout the code to indicate things that could use attention, but are

0 commit comments

Comments
 (0)