Fix optional component handling
Merge branch 'master' of https://github.com/tribal-tec/CMake