CMake CMP0046 changes