cmake build scripts clean-ups.