Normalize CMakeLists
Copy in Mac staging tinkerings