From 4504530fd568b5d1fc85e55e25f972432a73a2f3 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Fri, 28 Dec 2018 20:29:27 -0700 Subject: [PATCH] CMake: Also export FFmpeg/VRPN/DX9/VRPN I forgot to add these exports before. See bddd7c1b4b0544096aa6e301fe6a53c3d8a436c7 --- panda/metalibs/pandadx9/CMakeLists.txt | 2 ++ panda/metalibs/pandagles/CMakeLists.txt | 5 +++++ panda/metalibs/pandagles2/CMakeLists.txt | 2 ++ panda/src/ffmpeg/CMakeLists.txt | 2 ++ panda/src/vrpn/CMakeLists.txt | 2 ++ 5 files changed, 13 insertions(+) diff --git a/panda/metalibs/pandadx9/CMakeLists.txt b/panda/metalibs/pandadx9/CMakeLists.txt index 70d82d89d6..70c8e2ff3a 100644 --- a/panda/metalibs/pandadx9/CMakeLists.txt +++ b/panda/metalibs/pandadx9/CMakeLists.txt @@ -14,3 +14,5 @@ install(TARGETS pandadx9 EXPORT DX9 COMPONENT DX9 DESTINATION ${MODULE_DESTINATION} ARCHIVE COMPONENT DX9Devel) + +export_targets(DX9 COMPONENT DX9Devel) diff --git a/panda/metalibs/pandagles/CMakeLists.txt b/panda/metalibs/pandagles/CMakeLists.txt index 34a803e976..d5155e415b 100644 --- a/panda/metalibs/pandagles/CMakeLists.txt +++ b/panda/metalibs/pandagles/CMakeLists.txt @@ -22,3 +22,8 @@ install(TARGETS pandagles EXPORT GLES COMPONENT GLES DESTINATION ${MODULE_DESTINATION} ARCHIVE COMPONENT GLESDevel) + +if(NOT HAVE_GLES2) + # If GLES2 won't export this, we should do so here. + export_targets(GLES COMPONENT GLESDevel) +endif() diff --git a/panda/metalibs/pandagles2/CMakeLists.txt b/panda/metalibs/pandagles2/CMakeLists.txt index 74cb6c50a4..ebc0cbdcd2 100644 --- a/panda/metalibs/pandagles2/CMakeLists.txt +++ b/panda/metalibs/pandagles2/CMakeLists.txt @@ -14,3 +14,5 @@ install(TARGETS pandagles2 EXPORT GLES COMPONENT GLES DESTINATION ${MODULE_DESTINATION} ARCHIVE COMPONENT GLESDevel) + +export_targets(GLES COMPONENT GLESDevel) diff --git a/panda/src/ffmpeg/CMakeLists.txt b/panda/src/ffmpeg/CMakeLists.txt index ea20395469..f832602996 100644 --- a/panda/src/ffmpeg/CMakeLists.txt +++ b/panda/src/ffmpeg/CMakeLists.txt @@ -31,3 +31,5 @@ install(TARGETS p3ffmpeg RUNTIME DESTINATION bin ARCHIVE COMPONENT FFmpegDevel) install(FILES ${P3FFMPEG_HEADERS} COMPONENT FFmpegDevel DESTINATION include/panda3d) + +export_targets(FFmpeg COMPONENT FFmpegDevel) diff --git a/panda/src/vrpn/CMakeLists.txt b/panda/src/vrpn/CMakeLists.txt index 55f2fa91df..ff7e0f20c9 100644 --- a/panda/src/vrpn/CMakeLists.txt +++ b/panda/src/vrpn/CMakeLists.txt @@ -41,3 +41,5 @@ install(TARGETS p3vrpn RUNTIME DESTINATION bin ARCHIVE COMPONENT VRPNDevel) install(FILES ${P3VRPN_HEADERS} COMPONENT VRPNDevel DESTINATION include/panda3d) + +export_targets(VRPN COMPONENT VRPNDevel)