/SCalcBase

The base cmake setup for SCalc assignment.

Primary LanguageC++OtherNOASSERTION

SCalcBase

The base cmake setup for SCalc assignment.

Author: Braedy Kuzma (braedy@ualberta.ca)

Usage

Building

Linux

  1. 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.
  2. Make a directory that you intend to build the project in and change into that directory.
  3. Run cmake <path-to-SCalc-Base>.
  4. Run make.
  5. Done.

Pulling in upstream changes

If there are updates to your assignment you can retrieve them using the instructions here.

  1. Add the upstream as a remote using git remote add upstream <clone-link>.
  2. Fetch updates from the upstream using git fetch upstream
  3. Merge the updates into a local branch using git merge <local branch> upstream/<upstream branch>. Usually both branches are master.
  4. 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.