Minor CMake adjustments for compilation on Lenovo

In future, will try to upgrade these from hacks to more general
solutions.