improve superbuild modularity