Modify CMakeLists.txt to work around pr17763 and bring some bots back.