remove duplication
cherry-pick
Merge pull request #1 from ipa-fxm/hydro_syncmm

Hydro syncmm
fixed CMakeLists
Merge pull request #2 from ipa-fxm/hydro_dev

sync'ing branches