Adding more checks for CMake