Fixed cxx flags set incorrectly
Merge remote-tracking branch 'devel/improve_mac_build' into devel-master

* devel/improve_mac_build:
  Fixed cxx flags set incorrectly