Review CMake

Update CMake commands