CMake: Move "framework" to its own component

It can depend on graphics backends, so it can't go in Core.
This commit is contained in:
Sam Edwards 2019-02-23 01:28:26 -07:00
parent d961514892
commit 7097f5b0e1
2 changed files with 51 additions and 44 deletions

View File

@ -41,6 +41,11 @@
# Panda3D::Direct::p3direct # Panda3D::Direct::p3direct
# #
# #
# Framework - Panda's "p3framework" C++ framework.
#
# Panda3D::Framework::p3framework
#
#
# Egg - Support for the Egg file format. # Egg - Support for the Egg file format.
# #
# Panda3D::Egg::pandaegg # Panda3D::Egg::pandaegg
@ -106,7 +111,7 @@ include("${_panda_config_prefix}/Panda3DPackages.cmake")
set(_panda_components set(_panda_components
Core Python Tools Core Python Tools
Direct Egg Direct Framework Egg
Bullet ODE Bullet ODE
FFmpeg FFmpeg
OpenAL FMOD OpenAL FMOD

View File

@ -52,8 +52,10 @@ set_target_properties(p3framework PROPERTIES DEFINE_SYMBOL BUILDING_FRAMEWORK)
target_link_libraries(p3framework ${P3FRAMEWORK_LINK_TARGETS}) target_link_libraries(p3framework ${P3FRAMEWORK_LINK_TARGETS})
install(TARGETS p3framework install(TARGETS p3framework
EXPORT Core COMPONENT Core EXPORT Framework COMPONENT Framework
DESTINATION lib DESTINATION lib
RUNTIME DESTINATION bin RUNTIME DESTINATION bin
ARCHIVE COMPONENT CoreDevel) ARCHIVE COMPONENT FrameworkDevel)
install(FILES ${P3FRAMEWORK_HEADERS} COMPONENT CoreDevel DESTINATION include/panda3d) install(FILES ${P3FRAMEWORK_HEADERS} COMPONENT FrameworkDevel DESTINATION include/panda3d)
export_targets(Framework COMPONENT FrameworkDevel)