add GOTO2 and clean a bit the cmake macros
6 files changed