Cleaning up CMAKE
Cleaning up CMAKE
Merging Win 64 and Mac CMAKE