+ Convert to new style command.
+ Add new query command (required by the doxygen cmake macro).