More CMakeLists.txt cleanup, allows cmake with only -DWITH_UBUNTU=ON