CMakeLists.txt changes for compatibility with ubuntu