Update cmake changes
Merge branch 'master' of github.com:ASavojardoW/MPAGS_Cpp