Commit ce79c96489b2d95de95d27f91ab6281d91f92dca

Brent Cook 2023-10-29T12:34:01

Land #913, CMake build fixes