CMakeLists.txt fixes for mac
Merge branch 'develop' of https://github.com/Garrappachc/Vatsinator into develop