From 8df53698f4323e81f035123db4ab76e342858f3a Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Tue, 27 Nov 2018 21:51:31 -0700 Subject: [PATCH] CMake: Add missing .h/.I files that weren't getting installed --- direct/src/dcparser/CMakeLists.txt | 4 +++- dtool/src/dtoolbase/CMakeLists.txt | 2 ++ dtool/src/dtoolutil/CMakeLists.txt | 1 + dtool/src/interrogate/CMakeLists.txt | 4 ++-- dtool/src/interrogatedb/CMakeLists.txt | 2 +- dtool/src/prc/CMakeLists.txt | 3 ++- panda/src/cocoadisplay/CMakeLists.txt | 6 +++++- panda/src/collide/CMakeLists.txt | 1 + panda/src/downloader/CMakeLists.txt | 2 +- panda/src/express/CMakeLists.txt | 10 ++++++---- panda/src/glxdisplay/CMakeLists.txt | 2 +- panda/src/gobj/CMakeLists.txt | 2 ++ panda/src/linmath/CMakeLists.txt | 13 ++++++++----- panda/src/movies/CMakeLists.txt | 1 + panda/src/nativenet/CMakeLists.txt | 6 ++++-- panda/src/osxdisplay/CMakeLists.txt | 4 +++- panda/src/particlesystem/CMakeLists.txt | 9 ++++++++- panda/src/physics/CMakeLists.txt | 1 + panda/src/pipeline/CMakeLists.txt | 4 +++- panda/src/pnmimage/CMakeLists.txt | 1 + panda/src/pnmimagetypes/CMakeLists.txt | 4 +++- panda/src/putil/CMakeLists.txt | 5 +++++ panda/src/tform/CMakeLists.txt | 5 +++-- 23 files changed, 67 insertions(+), 25 deletions(-) diff --git a/direct/src/dcparser/CMakeLists.txt b/direct/src/dcparser/CMakeLists.txt index 3780cf5293..fd05dabe14 100644 --- a/direct/src/dcparser/CMakeLists.txt +++ b/direct/src/dcparser/CMakeLists.txt @@ -20,7 +20,9 @@ set(P3DCPARSER_HEADERS dcSwitch.h dcTypedef.h dcPython.h - dcbase.h dcindent.h hashGenerator.h + dcbase.h dcindent.h + dcmsgtypes.h + hashGenerator.h primeNumberGenerator.h) set(P3DCPARSER_SOURCES diff --git a/dtool/src/dtoolbase/CMakeLists.txt b/dtool/src/dtoolbase/CMakeLists.txt index 20557d0c7d..a534eede91 100644 --- a/dtool/src/dtoolbase/CMakeLists.txt +++ b/dtool/src/dtoolbase/CMakeLists.txt @@ -15,6 +15,7 @@ set(P3DTOOLBASE_HEADERS addHash.I addHash.h atomicAdjust.h atomicAdjustDummyImpl.h atomicAdjustDummyImpl.I + atomicAdjustGccImpl.h atomicAdjustGccImpl.I atomicAdjustI386Impl.h atomicAdjustI386Impl.I atomicAdjustPosixImpl.h atomicAdjustPosixImpl.I atomicAdjustWin32Impl.h atomicAdjustWin32Impl.I @@ -48,6 +49,7 @@ set(P3DTOOLBASE_HEADERS pdeque.h plist.h pmap.h pset.h pvector.h epvector.h lookup3.h + version.h ) set(P3DTOOLBASE_SOURCES diff --git a/dtool/src/dtoolutil/CMakeLists.txt b/dtool/src/dtoolutil/CMakeLists.txt index e624bf5985..3fdd4d990c 100644 --- a/dtool/src/dtoolutil/CMakeLists.txt +++ b/dtool/src/dtoolutil/CMakeLists.txt @@ -20,6 +20,7 @@ set(P3DTOOLUTIL_HEADERS vector_double.h vector_float.h vector_int.h + vector_stdfloat.h vector_string.h vector_uchar.h vector_src.h diff --git a/dtool/src/interrogate/CMakeLists.txt b/dtool/src/interrogate/CMakeLists.txt index 8882aa1af4..3f5b5d2ce1 100644 --- a/dtool/src/interrogate/CMakeLists.txt +++ b/dtool/src/interrogate/CMakeLists.txt @@ -91,8 +91,8 @@ if(NOT CMAKE_CROSSCOMPILING) endif() if(WANT_INTERROGATE) - install(TARGETS interrogate DESTINATION bin) - install(TARGETS interrogate_module DESTINATION bin) + install(TARGETS interrogate interrogate_module DESTINATION bin) + install(FILES ${INTERROGATE_HEADERS} DESTINATION include/panda3d) else() set_target_properties(interrogate interrogate_module PROPERTIES EXCLUDE_FROM_ALL ON) diff --git a/dtool/src/interrogatedb/CMakeLists.txt b/dtool/src/interrogatedb/CMakeLists.txt index a62730f057..70550022bd 100644 --- a/dtool/src/interrogatedb/CMakeLists.txt +++ b/dtool/src/interrogatedb/CMakeLists.txt @@ -30,7 +30,7 @@ set(P3INTERROGATEDB_IGATE ) set(P3IGATERUNTIME_HEADERS - extension.h py_compat.h py_panda.h py_wrappers.h + extension.h py_compat.h py_panda.h py_panda.I py_wrappers.h ) composite_sources(p3interrogatedb P3INTERROGATEDB_SOURCES) diff --git a/dtool/src/prc/CMakeLists.txt b/dtool/src/prc/CMakeLists.txt index 0d834afd62..d23243a183 100644 --- a/dtool/src/prc/CMakeLists.txt +++ b/dtool/src/prc/CMakeLists.txt @@ -1,6 +1,7 @@ configure_file(prc_parameters.h.in prc_parameters.h) set(P3PRC_HEADERS + androidLogStream.h bigEndian.h config_prc.h configDeclaration.I configDeclaration.h @@ -27,7 +28,7 @@ set(P3PRC_HEADERS notifyCategory.I notifyCategory.h notifyCategoryProxy.I notifyCategoryProxy.h notifySeverity.h - prcKeyRegistry.h + prcKeyRegistry.h prcKeyRegistry.I reversedNumericData.I reversedNumericData.h streamReader.I streamReader.h streamWrapper.I streamWrapper.h diff --git a/panda/src/cocoadisplay/CMakeLists.txt b/panda/src/cocoadisplay/CMakeLists.txt index bd7673ef89..a0a35227c2 100644 --- a/panda/src/cocoadisplay/CMakeLists.txt +++ b/panda/src/cocoadisplay/CMakeLists.txt @@ -4,10 +4,14 @@ endif() set(P3COCOADISPLAY_HEADERS config_cocoadisplay.h + cocoaGraphicsBuffer.h cocoaGraphicsBuffer.I cocoaGraphicsPipe.h cocoaGraphicsPipe.I cocoaGraphicsWindow.h cocoaGraphicsWindow.I cocoaGraphicsStateGuardian.h cocoaGraphicsStateGuardian.I - cocoaPandaApp.h cocoaPandaView.h cocoaPandaWindowDelegate.h + cocoaPandaApp.h + cocoaPandaView.h + cocoaPandaWindow.h + cocoaPandaWindowDelegate.h cocoaPandaAppDelegate.h) set(P3COCOADISPLAY_SOURCES diff --git a/panda/src/collide/CMakeLists.txt b/panda/src/collide/CMakeLists.txt index ef29604e87..344453092e 100644 --- a/panda/src/collide/CMakeLists.txt +++ b/panda/src/collide/CMakeLists.txt @@ -28,6 +28,7 @@ set(P3COLLIDE_HEADERS collisionTraverser.I collisionTraverser.h collisionTube.I collisionTube.h collisionVisualizer.I collisionVisualizer.h + config_collide.h ) set(P3COLLIDE_SOURCES collisionBox.cxx diff --git a/panda/src/downloader/CMakeLists.txt b/panda/src/downloader/CMakeLists.txt index 6f03d4bcba..ab9950285b 100644 --- a/panda/src/downloader/CMakeLists.txt +++ b/panda/src/downloader/CMakeLists.txt @@ -8,7 +8,7 @@ set(P3DOWNLOADER_HEADERS decompressor.h decompressor.I documentSpec.h documentSpec.I download_utils.h downloadDb.h downloadDb.I - extractor.h + extractor.h extractor.I httpAuthorization.I httpAuthorization.h httpBasicAuthorization.I httpBasicAuthorization.h httpChannel.I httpChannel.h diff --git a/panda/src/express/CMakeLists.txt b/panda/src/express/CMakeLists.txt index e6d3e11482..663ab97844 100644 --- a/panda/src/express/CMakeLists.txt +++ b/panda/src/express/CMakeLists.txt @@ -49,10 +49,12 @@ set(P3EXPRESS_HEADERS threadSafePointerToBase.I threadSafePointerToBase.h trueClock.I trueClock.h typedReferenceCount.I typedReferenceCount.h typedef.h - virtualFile.I virtualFileList.I virtualFileList.h virtualFileMount.h - virtualFileComposite.h virtualFileComposite.I virtualFile.h - virtualFileMount.I virtualFileMountMultifile.h - virtualFileMountMultifile.I + virtualFileList.I virtualFileList.h + virtualFileComposite.h virtualFileComposite.I + virtualFile.h virtualFile.I + virtualFileMount.h virtualFileMount.I + virtualFileMountAndroidAsset.h virtualFileMountAndroidAsset.I + virtualFileMountMultifile.h virtualFileMountMultifile.I virtualFileMountRamdisk.h virtualFileMountRamdisk.I virtualFileMountSystem.h virtualFileMountSystem.I virtualFileSimple.h virtualFileSimple.I diff --git a/panda/src/glxdisplay/CMakeLists.txt b/panda/src/glxdisplay/CMakeLists.txt index 19aab8a49f..33abd3298b 100644 --- a/panda/src/glxdisplay/CMakeLists.txt +++ b/panda/src/glxdisplay/CMakeLists.txt @@ -7,7 +7,7 @@ set(P3GLXDISPLAY_HEADERS glxGraphicsBuffer.h glxGraphicsBuffer.I glxGraphicsPipe.h glxGraphicsPipe.I glxGraphicsPixmap.h glxGraphicsPixmap.I - glxGraphicsWindow.h + glxGraphicsWindow.h glxGraphicsWindow.I glxGraphicsStateGuardian.h glxGraphicsStateGuardian.I posixGraphicsStateGuardian.h posixGraphicsStateGuardian.I panda_glxext.h diff --git a/panda/src/gobj/CMakeLists.txt b/panda/src/gobj/CMakeLists.txt index a4df5f7f32..cb5d5e5597 100644 --- a/panda/src/gobj/CMakeLists.txt +++ b/panda/src/gobj/CMakeLists.txt @@ -43,6 +43,8 @@ set(P3GOBJ_HEADERS perspectiveLens.I perspectiveLens.h preparedGraphicsObjects.I preparedGraphicsObjects.h queryContext.I queryContext.h + samplerContext.h samplerContext.I + samplerState.h samplerState.I savedContext.I savedContext.h shader.I shader.h shaderBuffer.h shaderBuffer.I diff --git a/panda/src/linmath/CMakeLists.txt b/panda/src/linmath/CMakeLists.txt index c3fa7332bd..2eddca24d4 100644 --- a/panda/src/linmath/CMakeLists.txt +++ b/panda/src/linmath/CMakeLists.txt @@ -5,11 +5,14 @@ set(P3LINMATH_HEADERS configVariableColor.h configVariableColor.I coordinateSystem.h dbl2fltnames.h dblnames.h deg_2_rad.h deg_2_rad.I - flt2dblnames.h fltnames.h lcast_to.h lcast_to_src.h - lcast_to_src.I lmatrix.h lmatrix_ext.h lmatrix3_src.I - lmatrix3_src.h lmatrix4_src.I - lmatrix4_src.h lorientation.h - lorientation_src.I lorientation_src.h + flt2dblnames.h fltnames.h + intnames.h + lcast_to.h lcast_to_src.h lcast_to_src.I + lmatrix.h lmatrix_ext.h + lmat_ops.h lmat_ops_src.h lmat_ops_src.I + lmatrix3_src.h lmatrix3_src.I + lmatrix4_src.h lmatrix4_src.I + lorientation.h lorientation_src.h lorientation_src.I lpoint2.h lpoint2_src.I lpoint2_src.h lpoint3.h lpoint3_src.I lpoint3_src.h lpoint4.h lpoint4_src.I lpoint4_src.h diff --git a/panda/src/movies/CMakeLists.txt b/panda/src/movies/CMakeLists.txt index 0f03bbadc5..1e41eee994 100644 --- a/panda/src/movies/CMakeLists.txt +++ b/panda/src/movies/CMakeLists.txt @@ -1,4 +1,5 @@ set(P3MOVIES_HEADERS + dr_flac.h config_movies.h flacAudio.h flacAudio.I flacAudioCursor.h flacAudioCursor.I diff --git a/panda/src/nativenet/CMakeLists.txt b/panda/src/nativenet/CMakeLists.txt index 7598a61942..bef8d792c9 100644 --- a/panda/src/nativenet/CMakeLists.txt +++ b/panda/src/nativenet/CMakeLists.txt @@ -3,16 +3,18 @@ if(NOT WANT_NATIVE_NET) endif() set(P3NATIVENET_HEADERS + config_nativenet.h buffered_datagramconnection.h buffered_datagramreader.h buffered_datagramreader.I ringbuffer.h ringbuffer.I socket_ip.h - socket_tcp_listen.h time_accumulator.h time_out.h + socket_tcp.h socket_tcp_listen.h socket_tcp_ssl.h + time_accumulator.h time_out.h socket_address.I socket_address.h socket_portable.h time_base.h time_span.h buffered_datagramwriter.h socket_base.h socket_selector.h socket_udp.h socket_udp_incoming.h time_clock.h - membuffer.h membuffer.I socket_fdset.h socket_tcp.h + membuffer.h membuffer.I socket_fdset.h socket_udp_outgoing.h time_general.h) set(P3NATIVENET_SOURCES diff --git a/panda/src/osxdisplay/CMakeLists.txt b/panda/src/osxdisplay/CMakeLists.txt index a26fc51123..d7ea87b582 100644 --- a/panda/src/osxdisplay/CMakeLists.txt +++ b/panda/src/osxdisplay/CMakeLists.txt @@ -4,12 +4,14 @@ endif() set(P3OSXDISPLAY_HEADERS config_osxdisplay.h + osxGraphicsBuffer.h osxGraphicsPipe.h osxGraphicsWindow.h osxGraphicsWindow.I osxGraphicsStateGuardian.h) set(P3OSXDISPLAY_SOURCES - config_osxdisplay.cxx osxGraphicsPipe.cxx osxGraphicsStateGuardian.cxx + config_osxdisplay.cxx + osxGraphicsPipe.cxx osxGraphicsStateGuardian.cxx osxGraphicsBuffer.cxx) composite_sources(p3osxdisplay P3OSXDISPLAY_SOURCES) diff --git a/panda/src/particlesystem/CMakeLists.txt b/panda/src/particlesystem/CMakeLists.txt index d6b74b057a..51136d03bf 100644 --- a/panda/src/particlesystem/CMakeLists.txt +++ b/panda/src/particlesystem/CMakeLists.txt @@ -5,8 +5,11 @@ set(P3PARTICLESYSTEM_HEADERS baseParticleRenderer.h arcEmitter.I arcEmitter.h boxEmitter.I boxEmitter.h config_particlesystem.h discEmitter.I discEmitter.h + emitters.h geomParticleRenderer.I geomParticleRenderer.h lineEmitter.I lineEmitter.h lineParticleRenderer.I lineParticleRenderer.h + particlefactories.h + particles.h particleSystem.I particleSystem.h particleSystemManager.I particleSystemManager.h pointEmitter.I pointEmitter.h pointParticle.h pointParticleFactory.h @@ -36,12 +39,16 @@ set(P3PARTICLESYSTEM_SOURCES tangentRingEmitter.cxx zSpinParticle.cxx zSpinParticleFactory.cxx colorInterpolationManager.cxx) +set(P3PARTICLESYSTEM_IGATE_SOURCES "${P3PARTICLESYSTEM_HEADERS};${P3PARTICLESYSTEM_SOURCES}") +list(REMOVE_ITEM P3PARTICLESYSTEM_IGATE_SOURCES "emitters.h") +list(REMOVE_ITEM P3PARTICLESYSTEM_IGATE_SOURCES "particlefactories.h") +list(REMOVE_ITEM P3PARTICLESYSTEM_IGATE_SOURCES "particles.h") composite_sources(p3particlesystem P3PARTICLESYSTEM_SOURCES) add_component_library(p3particlesystem SYMBOL BUILDING_PANDA_PARTICLESYSTEM ${P3PARTICLESYSTEM_HEADERS} ${P3PARTICLESYSTEM_SOURCES}) target_link_libraries(p3particlesystem p3physics panda) -target_interrogate(p3particlesystem ALL) +target_interrogate(p3particlesystem ${P3PARTICLESYSTEM_IGATE_SOURCES}) if(NOT BUILD_METALIBS) install(TARGETS p3particlesystem DESTINATION lib RUNTIME DESTINATION bin) diff --git a/panda/src/physics/CMakeLists.txt b/panda/src/physics/CMakeLists.txt index 7d17f65cbe..68f2b5a1aa 100644 --- a/panda/src/physics/CMakeLists.txt +++ b/panda/src/physics/CMakeLists.txt @@ -3,6 +3,7 @@ set(P3PHYSICS_HEADERS angularIntegrator.h angularVectorForce.I angularVectorForce.h baseForce.I baseForce.h baseIntegrator.I baseIntegrator.h config_physics.h + forces.h forceNode.I forceNode.h linearControlForce.I linearControlForce.h linearCylinderVortexForce.I linearCylinderVortexForce.h diff --git a/panda/src/pipeline/CMakeLists.txt b/panda/src/pipeline/CMakeLists.txt index 8af739fcfb..2e150f22e4 100644 --- a/panda/src/pipeline/CMakeLists.txt +++ b/panda/src/pipeline/CMakeLists.txt @@ -45,7 +45,8 @@ set(P3PIPELINE_HEADERS pmutex.h pmutex.I reMutex.I reMutex.h reMutexDirect.h reMutexDirect.I - reMutexHolder.I reMutexHolder.h + reMutexHolder.h reMutexHolder.I + reMutexSpinlockImpl.h reMutexSpinlockImpl.I psemaphore.h psemaphore.I thread.h thread.I threadImpl.h threadDummyImpl.h threadDummyImpl.I @@ -97,6 +98,7 @@ set(P3PIPELINE_SOURCES reMutex.cxx reMutexDirect.cxx reMutexHolder.cxx + reMutexSpinlockImpl.cxx psemaphore.cxx thread.cxx threadDummyImpl.cxx diff --git a/panda/src/pnmimage/CMakeLists.txt b/panda/src/pnmimage/CMakeLists.txt index 807cf1f9f9..66f881361b 100644 --- a/panda/src/pnmimage/CMakeLists.txt +++ b/panda/src/pnmimage/CMakeLists.txt @@ -1,5 +1,6 @@ set(P3PNMIMAGE_HEADERS config_pnmimage.h + convert_srgb.h convert_srgb.I pfmFile.I pfmFile.h pnmbitio.h pnmBrush.h pnmBrush.I diff --git a/panda/src/pnmimagetypes/CMakeLists.txt b/panda/src/pnmimagetypes/CMakeLists.txt index c29e7ae1a3..e6afb05a33 100644 --- a/panda/src/pnmimagetypes/CMakeLists.txt +++ b/panda/src/pnmimagetypes/CMakeLists.txt @@ -1,5 +1,6 @@ set(P3PNMIMAGETYPES_HEADERS - config_pnmimagetypes.h pnmFileTypeBMP.h + config_pnmimagetypes.h + pnmFileTypeBMP.h pnmFileTypeEXR.h pnmFileTypeIMG.h pnmFileTypePNG.h @@ -10,6 +11,7 @@ set(P3PNMIMAGETYPES_HEADERS pnmFileTypeTGA.h pnmFileTypeTIFF.h pnmFileTypeJPG.h + sgi.h ) set(P3PNMIMAGETYPES_SOURCES diff --git a/panda/src/putil/CMakeLists.txt b/panda/src/putil/CMakeLists.txt index 2dc2830b13..f0fd79a06e 100644 --- a/panda/src/putil/CMakeLists.txt +++ b/panda/src/putil/CMakeLists.txt @@ -42,6 +42,7 @@ set(P3PUTIL_HEADERS indirectCompareTo.I indirectCompareTo.h ioPtaDatagramFloat.h ioPtaDatagramInt.h ioPtaDatagramShort.h keyboardButton.h + iterator_types.h linkedListNode.I linkedListNode.h load_prc_file.h loaderOptions.I loaderOptions.h @@ -59,7 +60,9 @@ set(P3PUTIL_HEADERS typedWritableReferenceCount.h updateSeq.I updateSeq.h uniqueIdAllocator.h vector_typedWritable.h + vector_ulong.h vector_ushort.h vector_writable.h + weakKeyHashMap.h weakKeyHashMap.I writableConfigurable.h writableParam.I writableParam.h ) @@ -109,7 +112,9 @@ set(P3PUTIL_SOURCES typedWritableReferenceCount.cxx updateSeq.cxx uniqueIdAllocator.cxx vector_typedWritable.cxx + vector_ulong.cxx vector_ushort.cxx vector_writable.cxx + weakKeyHashMap.cxx writableConfigurable.cxx writableParam.cxx ) diff --git a/panda/src/tform/CMakeLists.txt b/panda/src/tform/CMakeLists.txt index ec1eaa5da5..a4e92c0083 100644 --- a/panda/src/tform/CMakeLists.txt +++ b/panda/src/tform/CMakeLists.txt @@ -4,8 +4,9 @@ set(P3TFORM_HEADERS driveInterface.I driveInterface.h mouseInterfaceNode.I mouseInterfaceNode.h mouseSubregion.I mouseSubregion.h - mouseWatcher.I mouseWatcher.h - mouseWatcherBase.h mouseWatcherGroup.h + mouseWatcher.h mouseWatcher.I + mouseWatcherBase.h mouseWatcherBase.I + mouseWatcherGroup.h mouseWatcherParameter.I mouseWatcherParameter.h mouseWatcherRegion.I mouseWatcherRegion.h trackball.h