Some CMake stuff added