updated cmake and spec build
some fixups for cmake