simplified CMake system per Gordon's suggestions