Merge branch 'rnou/343-update-cli-for-cmake-3-10' into 'master'

Resolve "update cli for cmake 3.10"

Closes #343

Closes #343

See merge request !232