CMake fix
Merge