fix CMake formatting
Merge branch 'hydro-devel' into indigo-devel