RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMake: Push Python links back to where they're actually needed 

This keeps the Panda3D core free of any Python-specific linkage
This commit is contained in:
Sam Edwards 2017-03-08 01:44:27 -07:00
parent 02c8d26150
commit 6926fbfbe6
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
direct/src/dcparser/CMakeLists.txt
View File

@ -50,6 +50,7 @@ add_library(p3dcparser ${P3DCPARSER_HEADERS} ${P3DCPARSER_SOURCES}
${P3DCPARSER_PARSER_SOURCES})
set_target_properties(p3dcparser PROPERTIES COMPILE_DEFINITIONS WITHIN_PANDA)
target_link_libraries(p3dcparser p3directbase p3express p3pstatclient p3prc)
target_use_packages(p3dcparser PYTHON)
target_interrogate(p3dcparser ${P3DCPARSER_HEADERS} ${P3DCPARSER_SOURCES})
install(TARGETS p3dcparser DESTINATION lib)

1
direct/src/distributed/CMakeLists.txt
View File

@ -14,6 +14,7 @@ if(HAVE_PYTHON)
add_library(p3distributed ${P3DISTRIBUTED_HEADERS} ${P3DISTRIBUTED_SOURCES})
set_target_properties(p3distributed PROPERTIES COMPILE_DEFINITIONS WITHIN_PANDA)
target_link_libraries(p3distributed p3directbase p3dcparser p3pgraph)
target_use_packages(p3distributed PYTHON)
if(WANT_NATIVE_NET)
target_link_libraries(p3distributed p3nativenet)
endif()

2
dtool/src/dtoolbase/CMakeLists.txt
View File

@ -65,7 +65,7 @@ set(P3DTOOLBASE_SOURCES
composite_sources(p3dtoolbase P3DTOOLBASE_SOURCES)
add_library(p3dtoolbase ${P3DTOOLBASE_HEADERS} ${P3DTOOLBASE_SOURCES})
target_use_packages(p3dtoolbase THREADS PYTHON)
target_use_packages(p3dtoolbase THREADS)
install(TARGETS p3dtoolbase DESTINATION lib)
install(FILES ${P3DTOOLBASE_HEADERS} DESTINATION include/panda3d)

3
dtool/src/dtoolutil/CMakeLists.txt
View File

@ -58,9 +58,6 @@ composite_sources(p3dtoolutil P3DTOOLUTIL_SOURCES)
add_library(p3dtoolutil ${P3DTOOLUTIL_HEADERS} ${P3DTOOLUTIL_SOURCES})
target_link_libraries(p3dtoolutil p3dtoolbase ${CMAKE_DL_LIBS})
if(HAVE_PYTHON)
target_link_libraries(p3dtoolutil ${PYTHON_LIBRARIES})
endif()
if(APPLE)
find_library(FOUNDATION_LIBRARY Foundation)

1
dtool/src/interrogatedb/CMakeLists.txt
View File

@ -29,6 +29,7 @@ composite_sources(p3interrogatedb P3INTERROGATEDB_SOURCES)
add_library(p3interrogatedb ${P3INTERROGATEDB_HEADERS} ${P3INTERROGATEDB_SOURCES})
target_link_libraries(p3interrogatedb p3dconfig)
target_use_packages(p3interrogatedb PYTHON)
install(TARGETS p3interrogatedb DESTINATION lib)
install(FILES ${P3INTERROGATEDB_HEADERS} DESTINATION include/panda3d)