CMake changes were not included in previous commit.  Now they are