improve cmake cmds