CMake: Don't compile Interrogate extensions into the component libraries.

panda/src/display/CMakeLists.txt

@@ -97,9 +97,9 @@ if(APPLE)
 endif()
 
 composite_sources(p3display P3DISPLAY_SOURCES)
-add_library(p3display ${P3DISPLAY_HEADERS} ${P3DISPLAY_SOURCES} ${P3DISPLAY_IGATEEXT})
+add_library(p3display ${P3DISPLAY_HEADERS} ${P3DISPLAY_SOURCES})
 target_link_libraries(p3display p3cull p3pgraphnodes)
-target_interrogate(p3display ALL)
+target_interrogate(p3display ALL ${P3DISPLAY_IGATEEXT})
 
 install(TARGETS p3display DESTINATION lib)
 

panda/src/egg/CMakeLists.txt

@@ -99,9 +99,9 @@ if(HAVE_EGG)
     lexer.cxx)
 
   composite_sources(p3egg P3EGG_SOURCES)
-  add_library(p3egg ${P3EGG_HEADERS} ${P3EGG_SOURCES} ${P3EGG_IGATEEXT} ${P3EGG_PARSER_SOURCES})
+  add_library(p3egg ${P3EGG_HEADERS} ${P3EGG_SOURCES} ${P3EGG_PARSER_SOURCES})
   target_link_libraries(p3egg p3prc p3pandabase p3express p3linmath p3mathutil)
-  target_interrogate(p3egg ${P3EGG_HEADERS} ${P3EGG_SOURCES} eggGroupNode_ext.h)
+  target_interrogate(p3egg ${P3EGG_HEADERS} ${P3EGG_SOURCES} ${P3EGG_IGATEEXT})
 
   install(TARGETS p3egg DESTINATION lib)
 endif()

panda/src/express/CMakeLists.txt

@@ -133,10 +133,10 @@ set(P3EXPRESS_IGATEEXT
 
 composite_sources(p3express P3EXPRESS_SOURCES)
 
-add_library(p3express ${P3EXPRESS_SOURCES} ${P3EXPRESS_HEADERS} ${P3EXPRESS_IGATEEXT})
+add_library(p3express ${P3EXPRESS_SOURCES} ${P3EXPRESS_HEADERS})
 target_link_libraries(p3express p3pandabase p3dtool p3dtoolconfig
   ${_TAR_LIBRARY} ${_ZLIB_LIBRARY})
-target_interrogate(p3express ALL)
+target_interrogate(p3express ALL ${P3EXPRESS_IGATEEXT})
 
 if(WIN32)
   target_link_libraries(p3express advapi32.lib ws2_32.lib)

panda/src/ode/CMakeLists.txt

@@ -81,7 +81,7 @@ if(HAVE_ODE)
   list(REMOVE_ITEM P3ODE_IGATE_SOURCES "odeHelperStructs.h")
 
   composite_sources(p3ode P3ODE_SOURCES)
-  add_library(p3ode ${P3ODE_SOURCES} ${P3ODE_HEADERS} ${P3ODE_IGATEEXT})
+  add_library(p3ode ${P3ODE_SOURCES} ${P3ODE_HEADERS})
   set_target_properties(p3ode PROPERTIES COMPILE_DEFINITIONS dSINGLE)
   target_link_libraries(p3ode p3pgraph p3physics ${ODE_LIBRARY})
   target_interrogate(p3ode ${P3ODE_IGATE_SOURCES} ${P3ODE_IGATEEXT})

panda/src/pgraph/CMakeLists.txt

@@ -206,9 +206,9 @@ set(P3PGRAPH_IGATEEXT
 )
 
 composite_sources(p3pgraph P3PGRAPH_SOURCES)
-add_library(p3pgraph ${P3PGRAPH_HEADERS} ${P3PGRAPH_SOURCES} ${P3PGRAPH_IGATEEXT})
+add_library(p3pgraph ${P3PGRAPH_HEADERS} ${P3PGRAPH_SOURCES})
 target_link_libraries(p3pgraph p3gobj p3event p3gsgbase p3putil p3linmath p3downloader)
-target_interrogate(p3pgraph ALL)
+target_interrogate(p3pgraph ALL ${P3PGRAPH_IGATEEXT})
 
 install(TARGETS p3pgraph DESTINATION lib)
 

panda/src/pnmimage/CMakeLists.txt

@@ -30,8 +30,8 @@ set(P3PNMIMAGE_IGATEEXT
 )
 
 composite_sources(p3pnmimage P3PNMIMAGE_SOURCES)
-add_library(p3pnmimage ${P3PNMIMAGE_HEADERS} ${P3PNMIMAGE_SOURCES} ${P3PNMIMAGE_IGATEEXT})
+add_library(p3pnmimage ${P3PNMIMAGE_HEADERS} ${P3PNMIMAGE_SOURCES})
 target_link_libraries(p3pnmimage p3mathutil)
-target_interrogate(p3pnmimage ALL)
+target_interrogate(p3pnmimage ALL ${P3PNMIMAGE_IGATEEXT})
 
 install(TARGETS p3pnmimage DESTINATION lib)

panda/src/putil/CMakeLists.txt

@@ -117,9 +117,9 @@ set(P3PUTIL_IGATEEXT
 )
 
 composite_sources(p3putil P3PUTIL_SOURCES)
-add_library(p3putil ${P3PUTIL_HEADERS} ${P3PUTIL_SOURCES} ${P3PUTIL_IGATEEXT})
+add_library(p3putil ${P3PUTIL_HEADERS} ${P3PUTIL_SOURCES})
 target_link_libraries(p3putil p3pipeline)
-target_interrogate(p3putil ALL)
+target_interrogate(p3putil ALL ${P3PUTIL_IGATEEXT})
 
 install(TARGETS p3putil DESTINATION lib)