Improved checking for MacOS versions
Consistent error message
Some more Mac fixes
Merge remote-tracking branch 'devel/improve_mac_build' into devel-master

* devel/improve_mac_build:
  Some more Mac fixes
  Consistent error message
  Improved checking for MacOS versions