Implement changes for CMake policy 0068