Changes to the CMake files for Ubuntu support.