Post-merge fix of CMake files