[cmake] Missing curly braces in include directories

Christoph Grüningerrequested to merge
fix/cmake-missing-curly-braces into master

Please cherry-pick for 2.5, too.

Merge request reports