Improve the CMake option stuff