Cmake support for MacOS has been added.
Merge branch 'master' into new_display