Add strip whitespace to avoid cmake warnings
More Mac OS X fixes
More fixes for Mac OS X.