Slight cleanup; redefined CMAKE_CXX_* in top-level directory