Commit fcc69445 authored by Ansgar Burchardt's avatar Ansgar Burchardt

Merge branch 'cherry-pick-c2187d13' into 'releases/2.5'

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

See merge request !44
parents 9f82d88f 524127b7
Pipeline #1606 passed with stage
in 29 minutes and 3 seconds