Merge branch 'fix/cmake-missing-curly-braces' into 'master'

Ansgar Burchardtrequested to merge
cherry-pick-c2187d13 into releases/2.5

[cmake] Missing curly braces in include directories

See merge request !43 (merged)

Merge request reports