Merged CMakeLists.txt for mac changes.