More CMake library searching amendments.