Merge topic 'cmGeneratorTarget-include-cmProperty' into release-3.18

e65e88fbce cmGeneratorTarget: fix misplaced header

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