Updated CMakeLists for MacOS support