CMake changes for new version of llvm