TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Don't depend on metalibs

Browse Source 
The metalibs may be phased out and should really be thought of as
a user convenience for the time being.
This commit is contained in:
Sam Edwards 2017-03-08 01:35:25 -07:00
parent 1e30cf6c16
commit 02c8d26150
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/express/CMakeLists.txt
View File

@ -146,8 +146,9 @@ set(P3EXPRESS_IGATEEXT
composite_sources(p3express P3EXPRESS_SOURCES) composite_sources(p3express P3EXPRESS_SOURCES)
add_library(p3express ${P3EXPRESS_SOURCES} ${P3EXPRESS_HEADERS}) 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}) ${_TAR_LIBRARY} ${_ZLIB_LIBRARY})
target_include_directories(p3express PUBLIC $<TARGET_PROPERTY:p3interrogatedb,INTERFACE_INCLUDE_DIRECTORIES>)
target_interrogate(p3express ALL EXTENSIONS ${P3EXPRESS_IGATEEXT}) target_interrogate(p3express ALL EXTENSIONS ${P3EXPRESS_IGATEEXT})
if(WIN32) if(WIN32)

2
pandatool/src/converter/CMakeLists.txt
View File

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