Merge topic 'test-CMakeLib'

1b2b4f7e5f Tests: Clean up CMakeLib test include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11530