CMake changes, script for MAC, to be tested