CMake: Add new _ext.* files to interrogate.

This commit is contained in:
Sam Edwards 2014-03-30 00:48:50 -06:00
parent d27bc99fcb
commit df6f76f494
6 changed files with 45 additions and 9 deletions

View File

@ -67,6 +67,11 @@ set(P3DISPLAY_SOURCES
touchInfo.cxx
)
set(P3DISPLAY_IGATEEXT
graphicsStateGuardian_ext.cxx
graphicsStateGuardian_ext.h
)
if(HAVE_PYTHON)
set(P3DISPLAY_HEADERS
${P3DISPLAY_HEADERS}
@ -87,7 +92,7 @@ if(OSX_PLATFORM)
endif()
composite_sources(p3display P3DISPLAY_SOURCES)
add_library(p3display ${P3DISPLAY_HEADERS} ${P3DISPLAY_SOURCES})
add_library(p3display ${P3DISPLAY_HEADERS} ${P3DISPLAY_SOURCES} ${P3DISPLAY_IGATEEXT})
target_link_libraries(p3display p3cull p3pgraphnodes)
target_interrogate(p3display ALL)

View File

@ -88,15 +88,20 @@ if(HAVE_EGG)
vector_PT_EggVertex.cxx
)
set(P3EGG_IGATEEXT
eggGroupNode_ext.cxx
eggGroupNode_ext.h
)
# These cannot be interrogated, and are excluded from the composites.
set(P3EGG_PARSER_SOURCES
parser.cxx
lexer.cxx)
composite_sources(p3egg P3EGG_SOURCES)
add_library(p3egg ${P3EGG_HEADERS} ${P3EGG_SOURCES} ${P3EGG_PARSER_SOURCES})
add_library(p3egg ${P3EGG_HEADERS} ${P3EGG_SOURCES} ${P3EGG_IGATEEXT} ${P3EGG_PARSER_SOURCES})
target_link_libraries(p3egg p3prc p3pandabase p3express p3linmath p3mathutil)
target_interrogate(p3egg ${P3EGG_HEADERS} ${P3EGG_SOURCES})
target_interrogate(p3egg ${P3EGG_HEADERS} ${P3EGG_SOURCES} eggGroupNode_ext.h)
install(TARGETS p3egg DESTINATION lib)
endif()

View File

@ -59,7 +59,6 @@ set(P3EXPRESS_HEADERS
virtualFileMountSystem.h virtualFileMountSystem.I
virtualFileSimple.h virtualFileSimple.I
virtualFileSystem.h virtualFileSystem.I
virtualFileSystem_ext.h
weakPointerCallback.I weakPointerCallback.h
weakPointerTo.I weakPointerTo.h
weakPointerToBase.I weakPointerToBase.h
@ -114,7 +113,6 @@ set(P3EXPRESS_SOURCES
virtualFileMountRamdisk.cxx
virtualFileMountSystem.cxx
virtualFileSimple.cxx virtualFileSystem.cxx
virtualFileSystem_ext.cxx
weakPointerCallback.cxx
weakPointerTo.cxx
weakPointerToBase.cxx
@ -123,9 +121,19 @@ set(P3EXPRESS_SOURCES
windowsRegistry.cxx
zStream.cxx zStreamBuf.cxx)
set(P3EXPRESS_IGATEEXT
memoryUsagePointers_ext.cxx
memoryUsagePointers_ext.h
ramfile_ext.cxx
ramfile_ext.h
streamReader_ext.cxx
streamReader_ext.h
virtualFileSystem_ext.cxx
virtualFileSystem_ext.h)
composite_sources(p3express P3EXPRESS_SOURCES)
add_library(p3express ${P3EXPRESS_SOURCES} ${P3EXPRESS_HEADERS})
add_library(p3express ${P3EXPRESS_SOURCES} ${P3EXPRESS_HEADERS} ${P3EXPRESS_IGATEEXT})
target_link_libraries(p3express p3pandabase p3dtool p3dtoolconfig
${_TAR_LIBRARY})
target_interrogate(p3express ALL)

View File

@ -196,8 +196,17 @@ set(P3PGRAPH_SOURCES
workingNodePath.cxx
)
set(P3PGRAPH_IGATEEXT
nodePathCollection_ext.cxx
nodePathCollection_ext.h
nodePathCollection_ext.I
nodePath_ext.cxx
nodePath_ext.h
nodePath_ext.I
)
composite_sources(p3pgraph P3PGRAPH_SOURCES)
add_library(p3pgraph ${P3PGRAPH_HEADERS} ${P3PGRAPH_SOURCES})
add_library(p3pgraph ${P3PGRAPH_HEADERS} ${P3PGRAPH_SOURCES} ${P3PGRAPH_IGATEEXT})
target_link_libraries(p3pgraph p3gobj p3event p3gsgbase p3putil p3linmath p3downloader)
target_interrogate(p3pgraph ALL)

View File

@ -24,8 +24,13 @@ set(P3PNMIMAGE_SOURCES
ppmcmap.cxx
)
set(P3PNMIMAGE_IGATEEXT
pfmFile_ext.cxx
pfmFile_ext.h
)
composite_sources(p3pnmimage P3PNMIMAGE_SOURCES)
add_library(p3pnmimage ${P3PNMIMAGE_HEADERS} ${P3PNMIMAGE_SOURCES})
add_library(p3pnmimage ${P3PNMIMAGE_HEADERS} ${P3PNMIMAGE_SOURCES} ${P3PNMIMAGE_IGATEEXT})
target_link_libraries(p3pnmimage p3mathutil)
target_interrogate(p3pnmimage ALL)

View File

@ -111,9 +111,13 @@ set(P3PUTIL_SOURCES
writableConfigurable.cxx writableParam.cxx
)
set(P3PUTIL_IGATEEXT
typedWritable_ext.cxx
typedWritable_ext.h
)
composite_sources(p3putil P3PUTIL_SOURCES)
add_library(p3putil ${P3PUTIL_HEADERS} ${P3PUTIL_SOURCES})
add_library(p3putil ${P3PUTIL_HEADERS} ${P3PUTIL_SOURCES} ${P3PUTIL_IGATEEXT})
target_link_libraries(p3putil p3pipeline)
target_interrogate(p3putil ALL)