Updated CMakeLists.txt for Unix builds, 2nd try