remove warnings
fix CMakeLists.txt
Merge pull request #161 from ipa320/hydro_dev

fix buildfarm errors