CMake stuff
Merged conflicts