CMake updates from RealXtend.