find_package: Use map::emplace instead of make_pair Replace map::insert(make_pair(...) with map::emplace(...). This should be slightly more efficient, but also removes one of only two uses of std::pair. (Upcoming changes are going to remove the other, which will let us drop use of <utility>.)