SCalcBase
The base cmake setup for SCalc assignment.
Author: Braedy Kuzma (braedy@ualberta.ca)
Usage
Building
Linux
- Install git, java (only the runtime is necessary), and cmake (>= v3.0).
- Until now, cmake has found the dependencies without issues. If you encounter an issue, let Braedy know and we can fix it.
- Make a directory that you intend to build the project in and change into that directory.
- Run
cmake <path-to-SCalc-Base>
. - Run
make
. - Done.
Pulling in upstream changes
If there are updates to your assignment you can retrieve them using the instructions here.
- Add the upstream as a remote using
git remote add upstream <clone-link>
. - Fetch updates from the upstream using
git fetch upstream
- Merge the updates into a local branch using
git merge <local branch> upstream/<upstream branch>
. Usually both branches aremaster
. - Make sure that everything builds before committing to your personal master! It's much easier to try again if you can make a fresh clone without the merge!
Once the remote has been added, future updates are simply the fetch
and
merge
steps.