more changes to make the superbuild work on Windows