Pull in update CMake modules with fixed search path variables. [skip ci]