compilation cleanup (OSX)

Continuing my cleanup compilation.
more cmake cleanup. rename OSX fixup script for better understanding