CMake fixes and one changed method signature
Merge pull request #171 from asmaloney/mac_build_fixes

CMake fixes and one changed method signature