Merging CMakeLists.txt from master into hydro_devel