Minor updates to cmake files to build on mac and win32