Updates to CMake compile scripts

No match.