Improve c++-mode configuration. Re-enable cmake-mode.