Added direct cmake names, dropped *.cmake too broad regex
Depend on elliptics not only through grape