fixed cmake macro and naming bug