Merge topic 'ExternalProject-env-mod' into release-4.2 8afe5f227c ExternalProject: Fix environment modification ops named with underscores Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !11442