From 4a9c9bf67c385cf9b8d04fa51c40dd101e358d69 Mon Sep 17 00:00:00 2001
From: Sam Edwards <CFSworks@gmail.com>
Date: Thu, 30 Jan 2014 12:25:07 -0700
Subject: [PATCH] Under CMake: Don't interrogate component libs that shouldn't
 be interrogated!

---
 panda/src/glgsg/CMakeLists.txt         | 1 -
 panda/src/glstuff/CMakeLists.txt       | 5 ++---
 panda/src/glxdisplay/CMakeLists.txt    | 1 -
 panda/src/pnmimagetypes/CMakeLists.txt | 1 -
 panda/src/x11display/CMakeLists.txt    | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/panda/src/glgsg/CMakeLists.txt b/panda/src/glgsg/CMakeLists.txt
index 06645e18e1..6f2fbd9aa7 100644
--- a/panda/src/glgsg/CMakeLists.txt
+++ b/panda/src/glgsg/CMakeLists.txt
@@ -12,5 +12,4 @@ if(HAVE_GL)
   add_library(p3glgsg ${P3GLGSG_HEADERS} ${P3GLGSG_SOURCES})
   target_link_libraries(p3glgsg p3glstuff p3display
     ${OPENGL_LIBRARIES} ${_CG_LIBRARIES})
-  target_interrogate(p3glgsg ALL)
 endif()
diff --git a/panda/src/glstuff/CMakeLists.txt b/panda/src/glstuff/CMakeLists.txt
index 23327d6c1f..dd983c0801 100644
--- a/panda/src/glstuff/CMakeLists.txt
+++ b/panda/src/glstuff/CMakeLists.txt
@@ -32,6 +32,5 @@ if(HAVE_GL)
 
   composite_sources(p3glstuff P3GLSTUFF_SOURCES)
   add_library(p3glstuff ${P3GLSTUFF_HEADERS} ${P3GLSTUFF_SOURCES})
-  target_link_libraries(p3glstuff p3pandabase)
-  target_interrogate(p3glstuff ALL)
-endif()
\ No newline at end of file
+  target_link_libraries(p3glstuff p3pandabase p3gobj)
+endif()
diff --git a/panda/src/glxdisplay/CMakeLists.txt b/panda/src/glxdisplay/CMakeLists.txt
index 079c6baa1d..975be01ad4 100644
--- a/panda/src/glxdisplay/CMakeLists.txt
+++ b/panda/src/glxdisplay/CMakeLists.txt
@@ -23,5 +23,4 @@ if(HAVE_GLX)
   composite_sources(p3glxdisplay P3GLXDISPLAY_SOURCES)
   add_library(p3glxdisplay ${P3GLXDISPLAY_HEADERS} ${P3GLXDISPLAY_SOURCES})
   target_link_libraries(p3glxdisplay p3glgsg p3x11display)
-  target_interrogate(p3glxdisplay ALL)
 endif()
diff --git a/panda/src/pnmimagetypes/CMakeLists.txt b/panda/src/pnmimagetypes/CMakeLists.txt
index 02f89a3a6d..295cba0ddb 100644
--- a/panda/src/pnmimagetypes/CMakeLists.txt
+++ b/panda/src/pnmimagetypes/CMakeLists.txt
@@ -30,4 +30,3 @@ composite_sources(p3pnmimagetypes P3PNMIMAGETYPES_SOURCES)
 add_library(p3pnmimagetypes ${P3PNMIMAGETYPES_HEADERS} ${P3PNMIMAGETYPES_SOURCES})
 target_link_libraries(p3pnmimagetypes p3pnmimage ${_JPEG_LIBRARIES}
   ${_TIFF_LIBRARIES} ${_PNG_LIBRARIES})
-target_interrogate(p3pnmimagetypes ALL)
diff --git a/panda/src/x11display/CMakeLists.txt b/panda/src/x11display/CMakeLists.txt
index 849bef5e42..bae6e338fc 100644
--- a/panda/src/x11display/CMakeLists.txt
+++ b/panda/src/x11display/CMakeLists.txt
@@ -11,5 +11,4 @@ if(HAVE_X11)
   composite_sources(p3x11display P3X11DISPLAY_SOURCES)
   add_library(p3x11display ${P3X11DISPLAY_HEADERS} ${P3X11DISPLAY_SOURCES})
   target_link_libraries(p3x11display p3display ${X11_LIBRARIES})
-  target_interrogate(p3x11display ALL)
 endif()