TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 07:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Break up "GLES" component into OpenGLES1/OpenGLES2

Browse Source
This commit is contained in:
Sam Edwards 2020-01-07 09:34:07 -07:00
parent ef238ca1fd
commit 69ff54a3d4
6 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmake/install/Panda3DConfig.cmake
View File

@ -93,10 +93,14 @@
# Panda3D::DX9::pandadx9
#
#
# GLES - Support for OpenGL ES rendering.
# OpenGLES1 - Support for OpenGL ES 1.x rendering.
#
# Panda3D::GLES::pandagles
# Panda3D::GLES::pandagles2
# Panda3D::OpenGLES1::pandagles
#
#
# OpenGLES2 - Support for OpenGL ES 2.x+ rendering.
#
# Panda3D::OpenGLES2::pandagles2
#
#
# Vision - Support for vision processing.
@ -122,7 +126,7 @@ set(_panda_components
Bullet ODE
FFmpeg
OpenAL FMOD
OpenGL DX9 GLES
OpenGL DX9 OpenGLES1 OpenGLES2
Vision VRPN
)

11
panda/metalibs/pandagles/CMakeLists.txt
View File

@ -12,7 +12,7 @@ else()
endif()
set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "GLESDevel")
set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "OpenGLES1Devel")
add_metalib(pandagles ${MODULE_TYPE}
INCLUDE "${GLES1_PIPE_INCLUDE}"
INIT init_libpandagles pandagles.h
@ -21,11 +21,8 @@ add_metalib(pandagles ${MODULE_TYPE}
unset(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)
install(TARGETS pandagles
EXPORT GLES COMPONENT GLES
EXPORT OpenGLES1 COMPONENT OpenGLES1
DESTINATION ${MODULE_DESTINATION}
ARCHIVE COMPONENT GLESDevel)
ARCHIVE COMPONENT OpenGLES1Devel)
if(NOT HAVE_GLES2)
# If GLES2 won't export this, we should do so here.
export_targets(GLES COMPONENT GLESDevel)
endif()
export_targets(OpenGLES1 COMPONENT OpenGLES1Devel)

8
panda/metalibs/pandagles2/CMakeLists.txt
View File

@ -2,7 +2,7 @@ if(NOT HAVE_GLES2 OR NOT HAVE_EGL)
return()
endif()
set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "GLESDevel")
set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME "OpenGLES2Devel")
add_metalib(pandagles2 ${MODULE_TYPE}
INCLUDE eglGraphicsPipe.h
INIT init_libpandagles2 pandagles2.h
@ -11,8 +11,8 @@ add_metalib(pandagles2 ${MODULE_TYPE}
unset(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME)
install(TARGETS pandagles2
EXPORT GLES COMPONENT GLES
EXPORT OpenGLES2 COMPONENT OpenGLES2
DESTINATION ${MODULE_DESTINATION}
ARCHIVE COMPONENT GLESDevel)
ARCHIVE COMPONENT OpenGLES2Devel)
export_targets(GLES COMPONENT GLESDevel)
export_targets(OpenGLES2 COMPONENT OpenGLES2Devel)

14
panda/src/egldisplay/CMakeLists.txt
View File

@ -37,12 +37,14 @@ if(HAVE_GLES1)
if(NOT BUILD_METALIBS)
install(TARGETS p3egldisplay_gles1
EXPORT GLES COMPONENT GLES
EXPORT OpenGLES1 COMPONENT OpenGLES1
DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
ARCHIVE COMPONENT GLESDevel)
ARCHIVE COMPONENT OpenGLES1Devel)
endif()
install(FILES ${P3EGLDISPLAY_HEADERS} COMPONENT OpenGLES1Devel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
endif()
if(HAVE_GLES2)
@ -55,12 +57,12 @@ if(HAVE_GLES2)
if(NOT BUILD_METALIBS)
install(TARGETS p3egldisplay_gles2
EXPORT GLES COMPONENT GLES
EXPORT OpenGLES2 COMPONENT OpenGLES2
DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
ARCHIVE COMPONENT GLESDevel)
ARCHIVE COMPONENT OpenGLES2Devel)
endif()
endif()
install(FILES ${P3EGLDISPLAY_HEADERS} COMPONENT GLESDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
install(FILES ${P3EGLDISPLAY_HEADERS} COMPONENT OpenGLES2Devel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
endif()

6
panda/src/gles2gsg/CMakeLists.txt
View File

@ -20,10 +20,10 @@ target_link_libraries(p3gles2gsg p3glstuff panda
if(NOT BUILD_METALIBS)
install(TARGETS p3gles2gsg
EXPORT GLES COMPONENT GLES
EXPORT OpenGLES2 COMPONENT OpenGLES2
DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
ARCHIVE COMPONENT GLESDevel)
ARCHIVE COMPONENT OpenGLES2Devel)
endif()
install(FILES ${P3GLES2GSG_HEADERS} COMPONENT GLESDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
install(FILES ${P3GLES2GSG_HEADERS} COMPONENT OpenGLES2Devel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)

6
panda/src/glesgsg/CMakeLists.txt
View File

@ -20,10 +20,10 @@ target_link_libraries(p3glesgsg p3glstuff panda
if(NOT BUILD_METALIBS)
install(TARGETS p3glesgsg
EXPORT GLES COMPONENT GLES
EXPORT OpenGLES1 COMPONENT OpenGLES1
DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d
ARCHIVE COMPONENT GLESDevel)
ARCHIVE COMPONENT OpenGLES1Devel)
endif()
install(FILES ${P3GLESGSG_HEADERS} COMPONENT GLESDevel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)
install(FILES ${P3GLESGSG_HEADERS} COMPONENT OpenGLES1Devel DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/panda3d)