Merge branch 'fix-deactivated-version-check-master' into 'master'

Markus Blattrequested to merge
cherry-pick-5b25a5a3 into releases/2.6

Make CMake work with disabled version check.

See merge request !408 (merged)

(cherry picked from commit 5b25a5a3)

2ffb1fc4 Make CMake work with disabled version check.

Merge request reports