[cmake] fixes more undefined macro warnings
fixes a couple of variable naming warnings