CMake fixes for Mac
Removed/moved libraries