CMake: Don't depend on metalibs

The metalibs may be phased out and should really be thought of as
a user convenience for the time being.

panda/src/express/CMakeLists.txt

@@ -146,8 +146,9 @@ set(P3EXPRESS_IGATEEXT
 composite_sources(p3express P3EXPRESS_SOURCES)
 
 add_library(p3express ${P3EXPRESS_SOURCES} ${P3EXPRESS_HEADERS})
-target_link_libraries(p3express p3pandabase p3dtool p3dtoolconfig
+target_link_libraries(p3express p3pandabase p3dtool p3prc p3dconfig
   ${_TAR_LIBRARY} ${_ZLIB_LIBRARY})
+target_include_directories(p3express PUBLIC $<TARGET_PROPERTY:p3interrogatedb,INTERFACE_INCLUDE_DIRECTORIES>)
 target_interrogate(p3express ALL EXTENSIONS ${P3EXPRESS_IGATEEXT})
 
 if(WIN32)

pandatool/src/converter/CMakeLists.txt

@@ -6,4 +6,4 @@ set(P3CONVERTER_SOURCES
     somethingToEggConverter.cxx eggToSomethingConverter.cxx)
 
 add_library(p3converter STATIC ${P3CONVERTER_HEADERS} ${P3CONVERTER_SOURCES})
-target_link_libraries(p3converter p3pandatoolbase pandaegg p3pystub)
+target_link_libraries(p3converter p3pandatoolbase p3egg2pg p3pystub)