Improve the CMake option stuff

No match.