Re-arranged where update our CMake policies (we still had the warnings on Windows) [ci skip].