fixing mac build errors
merged upstream changes
mac build fix
Merge branch 'newCMAKE' of github.com:ghost-kit/GHOST into newCMAKE