Address Sherm's comments about cmake macro.