Fix build

A couple of places in the CMakeLists.txt files seem to assume that
linking library A against library B will cause anything linked to A to
inherit the link to B.  This is only true of PUBLIC (or INTERFACE)
links.