CMake fixes for Mac build
Merge pull request #57 from asmaloney/mac-compile-fixes

CMake fixes for Mac build