Refactor catkin_make_isolated's plain cmake pkgs