diff --git a/direct/src/distributed/CMakeLists.txt b/direct/src/distributed/CMakeLists.txt
index 355548041a..e44be0d5c1 100644
--- a/direct/src/distributed/CMakeLists.txt
+++ b/direct/src/distributed/CMakeLists.txt
@@ -1,23 +1,25 @@
-if(HAVE_PYTHON)
-  set(P3DISTRIBUTED_HEADERS
-      config_distributed.h
-      cConnectionRepository.I
-      cConnectionRepository.h
-      cDistributedSmoothNodeBase.I
-      cDistributedSmoothNodeBase.h)
-
-  set(P3DISTRIBUTED_SOURCES
-      config_distributed.cxx
-      cConnectionRepository.cxx
-      cDistributedSmoothNodeBase.cxx)
-
-  add_component_library(p3distributed SYMBOL BUILDING_DIRECT_DISTRIBUTED
-    ${P3DISTRIBUTED_HEADERS} ${P3DISTRIBUTED_SOURCES})
-  target_compile_definitions(p3distributed PUBLIC WITHIN_PANDA)
-  target_link_libraries(p3distributed p3directbase p3dcparser panda)
-  target_use_packages(p3distributed PYTHON)
-  target_interrogate(p3distributed ALL)
-
-  install(TARGETS p3distributed DESTINATION lib)
-  install(FILES ${P3DISTRIBUTED_HEADERS} DESTINATION include/panda3d)
+if(NOT HAVE_PYTHON)
+  return()
 endif()
+
+set(P3DISTRIBUTED_HEADERS
+    config_distributed.h
+    cConnectionRepository.I
+    cConnectionRepository.h
+    cDistributedSmoothNodeBase.I
+    cDistributedSmoothNodeBase.h)
+
+set(P3DISTRIBUTED_SOURCES
+    config_distributed.cxx
+    cConnectionRepository.cxx
+    cDistributedSmoothNodeBase.cxx)
+
+add_component_library(p3distributed SYMBOL BUILDING_DIRECT_DISTRIBUTED
+  ${P3DISTRIBUTED_HEADERS} ${P3DISTRIBUTED_SOURCES})
+target_compile_definitions(p3distributed PUBLIC WITHIN_PANDA)
+target_link_libraries(p3distributed p3directbase p3dcparser panda)
+target_use_packages(p3distributed PYTHON)
+target_interrogate(p3distributed ALL)
+
+install(TARGETS p3distributed DESTINATION lib)
+install(FILES ${P3DISTRIBUTED_HEADERS} DESTINATION include/panda3d)
diff --git a/panda/metalibs/pandaegg/CMakeLists.txt b/panda/metalibs/pandaegg/CMakeLists.txt
index af185e5627..830649b448 100644
--- a/panda/metalibs/pandaegg/CMakeLists.txt
+++ b/panda/metalibs/pandaegg/CMakeLists.txt
@@ -1,8 +1,10 @@
-if(HAVE_EGG)
-  set(PANDAEGG_LINK_TARGETS p3egg p3egg2pg)
-
-  add_metalib(pandaegg pandaegg.cxx COMPONENTS ${PANDAEGG_LINK_TARGETS})
-  target_link_libraries(pandaegg panda)
-
-  install(TARGETS pandaegg DESTINATION lib)
+if(NOT HAVE_EGG)
+  return()
 endif()
+
+set(PANDAEGG_LINK_TARGETS p3egg p3egg2pg)
+
+add_metalib(pandaegg pandaegg.cxx COMPONENTS ${PANDAEGG_LINK_TARGETS})
+target_link_libraries(pandaegg panda)
+
+install(TARGETS pandaegg DESTINATION lib)
diff --git a/panda/src/audio/CMakeLists.txt b/panda/src/audio/CMakeLists.txt
index c87dff6c76..6fd101852c 100644
--- a/panda/src/audio/CMakeLists.txt
+++ b/panda/src/audio/CMakeLists.txt
@@ -1,28 +1,30 @@
-if(HAVE_AUDIO)
-  set(P3AUDIO_HEADERS
-      config_audio.h
-      filterProperties.h filterProperties.I
-      audioLoadRequest.h audioLoadRequest.I
-      audioManager.h audioManager.I
-      audioSound.h audioSound.I
-      nullAudioManager.h
-      nullAudioSound.h)
-
-  set(P3AUDIO_SOURCES
-      config_audio.cxx
-      filterProperties.cxx
-      audioLoadRequest.cxx
-      audioManager.cxx
-      audioSound.cxx
-      nullAudioManager.cxx
-      nullAudioSound.cxx)
-
-  composite_sources(p3audio P3AUDIO_SOURCES)
-  add_component_library(p3audio SYMBOL BUILDING_PANDA_AUDIO
-    ${P3AUDIO_HEADERS} ${P3AUDIO_SOURCES})
-  target_link_libraries(p3audio p3putil p3event p3movies p3linmath)
-  target_interrogate(p3audio ALL)
-
-  install(TARGETS p3audio DESTINATION lib)
-  install(FILES ${P3AUDIO_HEADERS} DESTINATION include/panda3d)
+if(NOT HAVE_AUDIO)
+  return()
 endif()
+
+set(P3AUDIO_HEADERS
+    config_audio.h
+    filterProperties.h filterProperties.I
+    audioLoadRequest.h audioLoadRequest.I
+    audioManager.h audioManager.I
+    audioSound.h audioSound.I
+    nullAudioManager.h
+    nullAudioSound.h)
+
+set(P3AUDIO_SOURCES
+    config_audio.cxx
+    filterProperties.cxx
+    audioLoadRequest.cxx
+    audioManager.cxx
+    audioSound.cxx
+    nullAudioManager.cxx
+    nullAudioSound.cxx)
+
+composite_sources(p3audio P3AUDIO_SOURCES)
+add_component_library(p3audio SYMBOL BUILDING_PANDA_AUDIO
+  ${P3AUDIO_HEADERS} ${P3AUDIO_SOURCES})
+target_link_libraries(p3audio p3putil p3event p3movies p3linmath)
+target_interrogate(p3audio ALL)
+
+install(TARGETS p3audio DESTINATION lib)
+install(FILES ${P3AUDIO_HEADERS} DESTINATION include/panda3d)
diff --git a/panda/src/audiotraits/CMakeLists.txt b/panda/src/audiotraits/CMakeLists.txt
index 8cf68126d6..266ca6f425 100644
--- a/panda/src/audiotraits/CMakeLists.txt
+++ b/panda/src/audiotraits/CMakeLists.txt
@@ -1,72 +1,70 @@
-if(HAVE_AUDIO)
-
-  if(HAVE_RAD_MSS)
-    set(P3MILES_HEADERS
-        config_milesAudio.h
-        milesAudioManager.h
-        milesAudioSound.I milesAudioSound.h
-        milesAudioSample.I milesAudioSample.h
-        milesAudioSequence.I milesAudioSequence.h
-        milesAudioStream.I milesAudioStream.h
-        globalMilesManager.I globalMilesManager.h)
-
-    set(P3MILES_SOURCES 
-        config_milesAudio.cxx milesAudioManager.cxx milesAudioSound.cxx
-        milesAudioStream.cxx globalMilesManager.cxx milesAudioSample.cxx
-        milesAudioSequence.cxx)
-
-    composite_sources(p3miles_audio P3MILES_SOURCES)
-    include_directories(${MILES_INCLUDE_DIR})
-    add_library(p3miles_audio ${P3MILES_HEADERS} ${P3MILES_SOURCES})
-    set_target_properties(p3miles_audio PROPERTIES DEFINE_SYMBOL BUILDING_MILES_AUDIO)
-    target_link_libraries(p3miles_audio panda)
-    target_use_packages(p3miles_audio MILES)
-
-    install(TARGETS p3miles_audio DESTINATION lib)
-  endif()
-
-  if(HAVE_FMODEX)
-    set(P3FMOD_HEADERS
-        config_fmodAudio.h
-        fmodAudioManager.h
-        fmodAudioSound.I fmodAudioSound.h)
-
-    set(P3FMOD_SOURCES      
-        config_fmodAudio.cxx fmodAudioManager.cxx fmodAudioSound.cxx)
-
-    composite_sources(p3fmod_audio P3FMOD_SOURCES)
-    include_directories(${FMODEX_INCLUDE_DIR})
-    add_library(p3fmod_audio ${P3FMOD_HEADERS} ${P3FMOD_SOURCES})
-    set_target_properties(p3fmod_audio PROPERTIES DEFINE_SYMBOL BUILDING_FMOD_AUDIO)
-    target_link_libraries(p3fmod_audio panda)
-    target_use_packages(p3fmod_audio FMODEX)
-
-    install(TARGETS p3fmod_audio DESTINATION lib)
-  endif()
-
-  if(HAVE_OPENAL)
-    set(P3OPENAL_HEADERS
-        config_openalAudio.h
-        openalAudioManager.h
-        openalAudioSound.I openalAudioSound.h)
-
-    set(P3OPENAL_SOURCES
-        config_openalAudio.cxx openalAudioManager.cxx openalAudioSound.cxx)
-
-
-    composite_sources(p3openal_audio P3OPENAL_SOURCES)
-    include_directories(${OPENAL_INCLUDE_DIR})
-    add_library(p3openal_audio ${P3OPENAL_HEADERS} ${P3OPENAL_SOURCES})
-    set_target_properties(p3openal_audio PROPERTIES DEFINE_SYMBOL BUILDING_OPENAL_AUDIO)
-    target_link_libraries(p3openal_audio panda)
-    target_use_packages(p3openal_audio OPENAL)
-
-    install(TARGETS p3openal_audio DESTINATION lib)
-  endif()
-
-  if(NOT HAVE_RAD_MSS AND NOT HAVE_FMODEX AND NOT HAVE_OPENAL)
-    message(SEND_ERROR
-      "You must have an audio backend for audio support! Turn off HAVE_AUDIO to ignore this.")
-  endif()
-
+if(NOT HAVE_AUDIO)
+  return()
+elseif(NOT HAVE_RAD_MSS AND NOT HAVE_FMODEX AND NOT HAVE_OPENAL)
+  message(SEND_ERROR
+    "You must have an audio backend for audio support! Turn off HAVE_AUDIO to ignore this.")
+endif()
+
+if(HAVE_RAD_MSS)
+  set(P3MILES_HEADERS
+      config_milesAudio.h
+      milesAudioManager.h
+      milesAudioSound.I milesAudioSound.h
+      milesAudioSample.I milesAudioSample.h
+      milesAudioSequence.I milesAudioSequence.h
+      milesAudioStream.I milesAudioStream.h
+      globalMilesManager.I globalMilesManager.h)
+
+  set(P3MILES_SOURCES
+      config_milesAudio.cxx milesAudioManager.cxx milesAudioSound.cxx
+      milesAudioStream.cxx globalMilesManager.cxx milesAudioSample.cxx
+      milesAudioSequence.cxx)
+
+  composite_sources(p3miles_audio P3MILES_SOURCES)
+  include_directories(${MILES_INCLUDE_DIR})
+  add_library(p3miles_audio ${P3MILES_HEADERS} ${P3MILES_SOURCES})
+  set_target_properties(p3miles_audio PROPERTIES DEFINE_SYMBOL BUILDING_MILES_AUDIO)
+  target_link_libraries(p3miles_audio panda)
+  target_use_packages(p3miles_audio MILES)
+
+  install(TARGETS p3miles_audio DESTINATION lib)
+endif()
+
+if(HAVE_FMODEX)
+  set(P3FMOD_HEADERS
+      config_fmodAudio.h
+      fmodAudioManager.h
+      fmodAudioSound.I fmodAudioSound.h)
+
+  set(P3FMOD_SOURCES
+      config_fmodAudio.cxx fmodAudioManager.cxx fmodAudioSound.cxx)
+
+  composite_sources(p3fmod_audio P3FMOD_SOURCES)
+  include_directories(${FMODEX_INCLUDE_DIR})
+  add_library(p3fmod_audio ${P3FMOD_HEADERS} ${P3FMOD_SOURCES})
+  set_target_properties(p3fmod_audio PROPERTIES DEFINE_SYMBOL BUILDING_FMOD_AUDIO)
+  target_link_libraries(p3fmod_audio panda)
+  target_use_packages(p3fmod_audio FMODEX)
+
+  install(TARGETS p3fmod_audio DESTINATION lib)
+endif()
+
+if(HAVE_OPENAL)
+  set(P3OPENAL_HEADERS
+      config_openalAudio.h
+      openalAudioManager.h
+      openalAudioSound.I openalAudioSound.h)
+
+  set(P3OPENAL_SOURCES
+      config_openalAudio.cxx openalAudioManager.cxx openalAudioSound.cxx)
+
+
+  composite_sources(p3openal_audio P3OPENAL_SOURCES)
+  include_directories(${OPENAL_INCLUDE_DIR})
+  add_library(p3openal_audio ${P3OPENAL_HEADERS} ${P3OPENAL_SOURCES})
+  set_target_properties(p3openal_audio PROPERTIES DEFINE_SYMBOL BUILDING_OPENAL_AUDIO)
+  target_link_libraries(p3openal_audio panda)
+  target_use_packages(p3openal_audio OPENAL)
+
+  install(TARGETS p3openal_audio DESTINATION lib)
 endif()
diff --git a/panda/src/cocoadisplay/CMakeLists.txt b/panda/src/cocoadisplay/CMakeLists.txt
index 7d5d5f1bd7..375b792bdf 100644
--- a/panda/src/cocoadisplay/CMakeLists.txt
+++ b/panda/src/cocoadisplay/CMakeLists.txt
@@ -1,33 +1,35 @@
-if(APPLE AND HAVE_GL AND HAVE_COCOA)
-  set(P3COCOADISPLAY_HEADERS
-      config_cocoadisplay.h
-      cocoaGraphicsPipe.h cocoaGraphicsPipe.I
-      cocoaGraphicsWindow.h cocoaGraphicsWindow.I
-      cocoaGraphicsStateGuardian.h cocoaGraphicsStateGuardian.I
-      cocoaPandaApp.h cocoaPandaView.h cocoaPandaWindowDelegate.h)
-
-  set(P3COCOADISPLAY_SOURCES
-      config_cocoadisplay.mm
-      cocoaGraphicsBuffer.mm
-      cocoaGraphicsPipe.mm
-      cocoaGraphicsStateGuardian.mm
-      cocoaGraphicsWindow.mm
-      cocoaPandaApp.mm
-      cocoaPandaView.mm
-      cocoaPandaWindow.mm
-      cocoaPandaWindowDelegate.mm)
-
-  #composite_sources(p3cocoadisplay P3COCOADISPLAY_SOURCES)
-  add_library(p3cocoadisplay ${P3COCOADISPLAY_HEADERS} ${P3COCOADISPLAY_SOURCES})
-  set_target_properties(p3cocoadisplay PROPERTIES DEFINE_SYMBOL BUILDING_PANDAGL)
-  target_link_libraries(p3cocoadisplay p3display p3putil p3glgsg)
-
-  # Frameworks:
-  find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
-  find_library(APPKIT_LIBRARY AppKit)
-  find_library(CARBON_LIBRARY Carbon)
-  target_link_libraries(p3cocoadisplay
-    ${APPLICATIONSERVICES_LIBRARY} ${APPKIT_LIBRARY} ${CARBON_LIBRARY})
-
-  install(TARGETS p3cocoadisplay DESTINATION lib)
+if(NOT APPLE OR NOT HAVE_GL OR NOT HAVE_COCOA)
+  return()
 endif()
+
+set(P3COCOADISPLAY_HEADERS
+    config_cocoadisplay.h
+    cocoaGraphicsPipe.h cocoaGraphicsPipe.I
+    cocoaGraphicsWindow.h cocoaGraphicsWindow.I
+    cocoaGraphicsStateGuardian.h cocoaGraphicsStateGuardian.I
+    cocoaPandaApp.h cocoaPandaView.h cocoaPandaWindowDelegate.h)
+
+set(P3COCOADISPLAY_SOURCES
+    config_cocoadisplay.mm
+    cocoaGraphicsBuffer.mm
+    cocoaGraphicsPipe.mm
+    cocoaGraphicsStateGuardian.mm
+    cocoaGraphicsWindow.mm
+    cocoaPandaApp.mm
+    cocoaPandaView.mm
+    cocoaPandaWindow.mm
+    cocoaPandaWindowDelegate.mm)
+
+#composite_sources(p3cocoadisplay P3COCOADISPLAY_SOURCES)
+add_library(p3cocoadisplay ${P3COCOADISPLAY_HEADERS} ${P3COCOADISPLAY_SOURCES})
+set_target_properties(p3cocoadisplay PROPERTIES DEFINE_SYMBOL BUILDING_PANDAGL)
+target_link_libraries(p3cocoadisplay p3display p3putil p3glgsg)
+
+# Frameworks:
+find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
+find_library(APPKIT_LIBRARY AppKit)
+find_library(CARBON_LIBRARY Carbon)
+target_link_libraries(p3cocoadisplay
+  ${APPLICATIONSERVICES_LIBRARY} ${APPKIT_LIBRARY} ${CARBON_LIBRARY})
+
+install(TARGETS p3cocoadisplay DESTINATION lib)
diff --git a/panda/src/egg/CMakeLists.txt b/panda/src/egg/CMakeLists.txt
index 829b5804b2..fe5d24d427 100644
--- a/panda/src/egg/CMakeLists.txt
+++ b/panda/src/egg/CMakeLists.txt
@@ -1,109 +1,111 @@
-if(HAVE_EGG)
-  add_bison_target(parser.cxx parser.yxx DEFINES parser.h PREFIX eggyy)
-  add_flex_target(lexer.cxx lexer.lxx CASE_INSENSITIVE PREFIX eggyy)
-
-  set(P3EGG_HEADERS
-    config_egg.h eggAnimData.I eggAnimData.h
-    eggAnimPreload.I eggAnimPreload.h
-    eggAttributes.I
-    eggAttributes.h eggBin.h eggBinMaker.h eggComment.I
-    eggComment.h
-    eggCompositePrimitive.I eggCompositePrimitive.h
-    eggCoordinateSystem.I eggCoordinateSystem.h
-    eggCurve.I eggCurve.h eggData.I eggData.h
-    eggExternalReference.I eggExternalReference.h
-    eggFilenameNode.I eggFilenameNode.h eggGroup.I eggGroup.h
-    eggGroupNode.I eggGroupNode.h eggGroupUniquifier.h
-    eggLine.I eggLine.h
-    eggMaterial.I eggMaterial.h eggMaterialCollection.I
-    eggMaterialCollection.h
-    eggMesher.h eggMesher.I
-    eggMesherEdge.h eggMesherEdge.I
-    eggMesherFanMaker.h eggMesherFanMaker.I
-    eggMesherStrip.h eggMesherStrip.I
-    eggMiscFuncs.I eggMiscFuncs.h
-    eggMorph.I eggMorph.h eggMorphList.I eggMorphList.h
-    eggNamedObject.I eggNamedObject.h eggNameUniquifier.h
-    eggNode.I eggNode.h eggNurbsCurve.I eggNurbsCurve.h
-    eggNurbsSurface.I eggNurbsSurface.h eggObject.I eggObject.h
-    eggParameters.h
-    eggPatch.I eggPatch.h
-    eggPoint.I eggPoint.h eggPolygon.I
-    eggPolygon.h eggPolysetMaker.h eggPoolUniquifier.h
-    eggPrimitive.I eggPrimitive.h
-    eggRenderMode.I eggRenderMode.h
-    eggSAnimData.I eggSAnimData.h eggSurface.I eggSurface.h
-    eggSwitchCondition.h eggTable.I eggTable.h eggTexture.I
-    eggTexture.h eggTextureCollection.I eggTextureCollection.h
-    eggTriangleFan.I eggTriangleFan.h
-    eggTriangleStrip.I eggTriangleStrip.h
-    eggTransform.I eggTransform.h
-    eggUserData.I eggUserData.h
-    eggUtilities.I eggUtilities.h
-    eggVertex.I eggVertex.h
-    eggVertexAux.I eggVertexAux.h
-    eggVertexPool.I eggVertexPool.h
-    eggVertexUV.I eggVertexUV.h
-    eggXfmAnimData.I
-    eggXfmAnimData.h eggXfmSAnim.I eggXfmSAnim.h parserDefs.h
-    parser.yxx lexerDefs.h lexer.lxx pt_EggMaterial.h
-    vector_PT_EggMaterial.h pt_EggTexture.h
-    vector_PT_EggTexture.h pt_EggVertex.h vector_PT_EggVertex.h
-  )
-
-  set(P3EGG_SOURCES
-    config_egg.cxx eggAnimData.cxx
-    eggAnimPreload.cxx
-    eggAttributes.cxx eggBin.cxx
-    eggBinMaker.cxx eggComment.cxx
-    eggCompositePrimitive.cxx
-    eggCoordinateSystem.cxx
-    eggCurve.cxx eggData.cxx eggExternalReference.cxx
-    eggFilenameNode.cxx eggGroup.cxx eggGroupNode.cxx
-    eggGroupUniquifier.cxx eggLine.cxx eggMaterial.cxx
-    eggMaterialCollection.cxx
-    eggMesher.cxx
-    eggMesherEdge.cxx
-    eggMesherFanMaker.cxx
-    eggMesherStrip.cxx
-    eggMiscFuncs.cxx eggMorphList.cxx
-    eggNamedObject.cxx eggNameUniquifier.cxx eggNode.cxx
-    eggNurbsCurve.cxx eggNurbsSurface.cxx eggObject.cxx
-    eggParameters.cxx
-    eggPatch.cxx
-    eggPoint.cxx eggPolygon.cxx eggPolysetMaker.cxx
-    eggPoolUniquifier.cxx eggPrimitive.cxx eggRenderMode.cxx
-    eggSAnimData.cxx eggSurface.cxx eggSwitchCondition.cxx
-    eggTable.cxx eggTexture.cxx eggTextureCollection.cxx
-    eggTransform.cxx
-    eggTriangleFan.cxx
-    eggTriangleStrip.cxx
-    eggUserData.cxx
-    eggUtilities.cxx eggVertex.cxx
-    eggVertexAux.cxx
-    eggVertexPool.cxx eggVertexUV.cxx
-    eggXfmAnimData.cxx eggXfmSAnim.cxx pt_EggMaterial.cxx
-    vector_PT_EggMaterial.cxx pt_EggTexture.cxx
-    vector_PT_EggTexture.cxx pt_EggVertex.cxx
-    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_component_library(p3egg SYMBOL BUILDING_PANDAEGG
-    ${P3EGG_HEADERS} ${P3EGG_SOURCES} ${P3EGG_PARSER_SOURCES})
-  target_link_libraries(p3egg panda)
-  target_interrogate(p3egg ${P3EGG_HEADERS} ${P3EGG_SOURCES} EXTENSIONS ${P3EGG_IGATEEXT})
-
-  install(TARGETS p3egg DESTINATION lib)
-  install(FILES ${P3EGG_HEADERS} DESTINATION include/panda3d)
+if(NOT HAVE_EGG)
+  return()
 endif()
+
+add_bison_target(parser.cxx parser.yxx DEFINES parser.h PREFIX eggyy)
+add_flex_target(lexer.cxx lexer.lxx CASE_INSENSITIVE PREFIX eggyy)
+
+set(P3EGG_HEADERS
+  config_egg.h eggAnimData.I eggAnimData.h
+  eggAnimPreload.I eggAnimPreload.h
+  eggAttributes.I
+  eggAttributes.h eggBin.h eggBinMaker.h eggComment.I
+  eggComment.h
+  eggCompositePrimitive.I eggCompositePrimitive.h
+  eggCoordinateSystem.I eggCoordinateSystem.h
+  eggCurve.I eggCurve.h eggData.I eggData.h
+  eggExternalReference.I eggExternalReference.h
+  eggFilenameNode.I eggFilenameNode.h eggGroup.I eggGroup.h
+  eggGroupNode.I eggGroupNode.h eggGroupUniquifier.h
+  eggLine.I eggLine.h
+  eggMaterial.I eggMaterial.h eggMaterialCollection.I
+  eggMaterialCollection.h
+  eggMesher.h eggMesher.I
+  eggMesherEdge.h eggMesherEdge.I
+  eggMesherFanMaker.h eggMesherFanMaker.I
+  eggMesherStrip.h eggMesherStrip.I
+  eggMiscFuncs.I eggMiscFuncs.h
+  eggMorph.I eggMorph.h eggMorphList.I eggMorphList.h
+  eggNamedObject.I eggNamedObject.h eggNameUniquifier.h
+  eggNode.I eggNode.h eggNurbsCurve.I eggNurbsCurve.h
+  eggNurbsSurface.I eggNurbsSurface.h eggObject.I eggObject.h
+  eggParameters.h
+  eggPatch.I eggPatch.h
+  eggPoint.I eggPoint.h eggPolygon.I
+  eggPolygon.h eggPolysetMaker.h eggPoolUniquifier.h
+  eggPrimitive.I eggPrimitive.h
+  eggRenderMode.I eggRenderMode.h
+  eggSAnimData.I eggSAnimData.h eggSurface.I eggSurface.h
+  eggSwitchCondition.h eggTable.I eggTable.h eggTexture.I
+  eggTexture.h eggTextureCollection.I eggTextureCollection.h
+  eggTriangleFan.I eggTriangleFan.h
+  eggTriangleStrip.I eggTriangleStrip.h
+  eggTransform.I eggTransform.h
+  eggUserData.I eggUserData.h
+  eggUtilities.I eggUtilities.h
+  eggVertex.I eggVertex.h
+  eggVertexAux.I eggVertexAux.h
+  eggVertexPool.I eggVertexPool.h
+  eggVertexUV.I eggVertexUV.h
+  eggXfmAnimData.I
+  eggXfmAnimData.h eggXfmSAnim.I eggXfmSAnim.h parserDefs.h
+  parser.yxx lexerDefs.h lexer.lxx pt_EggMaterial.h
+  vector_PT_EggMaterial.h pt_EggTexture.h
+  vector_PT_EggTexture.h pt_EggVertex.h vector_PT_EggVertex.h
+)
+
+set(P3EGG_SOURCES
+  config_egg.cxx eggAnimData.cxx
+  eggAnimPreload.cxx
+  eggAttributes.cxx eggBin.cxx
+  eggBinMaker.cxx eggComment.cxx
+  eggCompositePrimitive.cxx
+  eggCoordinateSystem.cxx
+  eggCurve.cxx eggData.cxx eggExternalReference.cxx
+  eggFilenameNode.cxx eggGroup.cxx eggGroupNode.cxx
+  eggGroupUniquifier.cxx eggLine.cxx eggMaterial.cxx
+  eggMaterialCollection.cxx
+  eggMesher.cxx
+  eggMesherEdge.cxx
+  eggMesherFanMaker.cxx
+  eggMesherStrip.cxx
+  eggMiscFuncs.cxx eggMorphList.cxx
+  eggNamedObject.cxx eggNameUniquifier.cxx eggNode.cxx
+  eggNurbsCurve.cxx eggNurbsSurface.cxx eggObject.cxx
+  eggParameters.cxx
+  eggPatch.cxx
+  eggPoint.cxx eggPolygon.cxx eggPolysetMaker.cxx
+  eggPoolUniquifier.cxx eggPrimitive.cxx eggRenderMode.cxx
+  eggSAnimData.cxx eggSurface.cxx eggSwitchCondition.cxx
+  eggTable.cxx eggTexture.cxx eggTextureCollection.cxx
+  eggTransform.cxx
+  eggTriangleFan.cxx
+  eggTriangleStrip.cxx
+  eggUserData.cxx
+  eggUtilities.cxx eggVertex.cxx
+  eggVertexAux.cxx
+  eggVertexPool.cxx eggVertexUV.cxx
+  eggXfmAnimData.cxx eggXfmSAnim.cxx pt_EggMaterial.cxx
+  vector_PT_EggMaterial.cxx pt_EggTexture.cxx
+  vector_PT_EggTexture.cxx pt_EggVertex.cxx
+  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_component_library(p3egg SYMBOL BUILDING_PANDAEGG
+  ${P3EGG_HEADERS} ${P3EGG_SOURCES} ${P3EGG_PARSER_SOURCES})
+target_link_libraries(p3egg panda)
+target_interrogate(p3egg ${P3EGG_HEADERS} ${P3EGG_SOURCES} EXTENSIONS ${P3EGG_IGATEEXT})
+
+install(TARGETS p3egg DESTINATION lib)
+install(FILES ${P3EGG_HEADERS} DESTINATION include/panda3d)
diff --git a/panda/src/egg2pg/CMakeLists.txt b/panda/src/egg2pg/CMakeLists.txt
index 5eb9e1dbaa..f5c2c7683c 100644
--- a/panda/src/egg2pg/CMakeLists.txt
+++ b/panda/src/egg2pg/CMakeLists.txt
@@ -1,40 +1,42 @@
-if(HAVE_EGG)
-  set(P3EGG2PG_HEADERS
-    animBundleMaker.h
-    characterMaker.h
-    config_egg2pg.h
-    deferredNodeProperty.h
-    eggBinner.h
-    eggLoader.h eggLoader.I
-    eggRenderState.h eggRenderState.I
-    eggSaver.h eggSaver.I
-    egg_parametrics.h
-    load_egg_file.h
-    save_egg_file.h
-    loaderFileTypeEgg.h
-  )
-
-  set(P3EGG2PG_SOURCES
-    animBundleMaker.cxx
-    characterMaker.cxx
-    config_egg2pg.cxx
-    deferredNodeProperty.cxx
-    eggBinner.cxx
-    eggLoader.cxx
-    eggRenderState.cxx
-    eggSaver.cxx
-    egg_parametrics.cxx
-    load_egg_file.cxx
-    save_egg_file.cxx
-    loaderFileTypeEgg.cxx
-  )
-
-  composite_sources(p3egg2pg P3EGG2PG_SOURCES)
-  add_component_library(p3egg2pg SYMBOL BUILDING_PANDAEGG
-    ${P3EGG2PG_HEADERS} ${P3EGG2PG_SOURCES})
-  target_link_libraries(p3egg2pg panda p3egg)
-  target_interrogate(p3egg2pg ALL)
-
-  install(TARGETS p3egg2pg DESTINATION lib)
-  install(FILES ${P3EGG2PG_HEADERS} DESTINATION include/panda3d)
+if(NOT HAVE_EGG)
+  return()
 endif()
+
+set(P3EGG2PG_HEADERS
+  animBundleMaker.h
+  characterMaker.h
+  config_egg2pg.h
+  deferredNodeProperty.h
+  eggBinner.h
+  eggLoader.h eggLoader.I
+  eggRenderState.h eggRenderState.I
+  eggSaver.h eggSaver.I
+  egg_parametrics.h
+  load_egg_file.h
+  save_egg_file.h
+  loaderFileTypeEgg.h
+)
+
+set(P3EGG2PG_SOURCES
+  animBundleMaker.cxx
+  characterMaker.cxx
+  config_egg2pg.cxx
+  deferredNodeProperty.cxx
+  eggBinner.cxx
+  eggLoader.cxx
+  eggRenderState.cxx
+  eggSaver.cxx
+  egg_parametrics.cxx
+  load_egg_file.cxx
+  save_egg_file.cxx
+  loaderFileTypeEgg.cxx
+)
+
+composite_sources(p3egg2pg P3EGG2PG_SOURCES)
+add_component_library(p3egg2pg SYMBOL BUILDING_PANDAEGG
+  ${P3EGG2PG_HEADERS} ${P3EGG2PG_SOURCES})
+target_link_libraries(p3egg2pg panda p3egg)
+target_interrogate(p3egg2pg ALL)
+
+install(TARGETS p3egg2pg DESTINATION lib)
+install(FILES ${P3EGG2PG_HEADERS} DESTINATION include/panda3d)
diff --git a/panda/src/ffmpeg/CMakeLists.txt b/panda/src/ffmpeg/CMakeLists.txt
index a0c9102d47..8f78a93ac5 100644
--- a/panda/src/ffmpeg/CMakeLists.txt
+++ b/panda/src/ffmpeg/CMakeLists.txt
@@ -1,28 +1,29 @@
-if(HAVE_FFMPEG)
-
-  set(P3FFMPEG_HEADERS
-      config_ffmpeg.h
-      ffmpegVideo.h ffmpegVideo.I
-      ffmpegVideoCursor.h ffmpegVideoCursor.I
-      ffmpegAudio.h ffmpegAudio.I
-      ffmpegAudioCursor.h ffmpegAudioCursor.I
-      ffmpegVirtualFile.h ffmpegVirtualFile.I)
-    
-
-  set(P3FFMPEG_SOURCES
-      config_ffmpeg.cxx
-      ffmpegVideo.cxx
-      ffmpegVideoCursor.cxx
-      ffmpegAudio.cxx
-      ffmpegAudioCursor.cxx
-      ffmpegVirtualFile.cxx) 
-
-  composite_sources(p3ffmpeg P3FFMPEG_SOURCES)
-  add_library(p3ffmpeg ${P3FFMPEG_HEADERS} ${P3FFMPEG_SOURCES})
-  set_target_properties(p3ffmpeg PROPERTIES DEFINE_SYMBOL BUILDING_FFMPEG)
-  target_link_libraries(p3ffmpeg panda)
-  target_use_packages(p3ffmpeg FFMPEG SWSCALE SWRESAMPLE)
-
-  install(TARGETS p3ffmpeg DESTINATION lib)
-  install(FILES ${P3FFMPEG_HEADERS} DESTINATION include/panda3d)
+if(NOT HAVE_FFMPEG)
+  return()
 endif()
+
+set(P3FFMPEG_HEADERS
+    config_ffmpeg.h
+    ffmpegVideo.h ffmpegVideo.I
+    ffmpegVideoCursor.h ffmpegVideoCursor.I
+    ffmpegAudio.h ffmpegAudio.I
+    ffmpegAudioCursor.h ffmpegAudioCursor.I
+    ffmpegVirtualFile.h ffmpegVirtualFile.I)
+
+
+set(P3FFMPEG_SOURCES
+    config_ffmpeg.cxx
+    ffmpegVideo.cxx
+    ffmpegVideoCursor.cxx
+    ffmpegAudio.cxx
+    ffmpegAudioCursor.cxx
+    ffmpegVirtualFile.cxx)
+
+composite_sources(p3ffmpeg P3FFMPEG_SOURCES)
+add_library(p3ffmpeg ${P3FFMPEG_HEADERS} ${P3FFMPEG_SOURCES})
+set_target_properties(p3ffmpeg PROPERTIES DEFINE_SYMBOL BUILDING_FFMPEG)
+target_link_libraries(p3ffmpeg panda)
+target_use_packages(p3ffmpeg FFMPEG SWSCALE SWRESAMPLE)
+
+install(TARGETS p3ffmpeg DESTINATION lib)
+install(FILES ${P3FFMPEG_HEADERS} DESTINATION include/panda3d)
diff --git a/panda/src/glgsg/CMakeLists.txt b/panda/src/glgsg/CMakeLists.txt
index d7a9763b9c..ac243e44f7 100644
--- a/panda/src/glgsg/CMakeLists.txt
+++ b/panda/src/glgsg/CMakeLists.txt
@@ -1,20 +1,22 @@
-if(HAVE_GL)
-  set(P3GLGSG_HEADERS
-    config_glgsg.h glgsg.h
-  )
-
-  set(P3GLGSG_SOURCES
-    config_glgsg.cxx
-    glgsg.cxx
-  )
-
-  composite_sources(p3glgsg P3GLGSG_SOURCES)
-  add_component_library(p3glgsg SYMBOL BUILDING_PANDAGL
-    ${P3GLGSG_HEADERS} ${P3GLGSG_SOURCES})
-  target_link_libraries(p3glgsg p3glstuff panda
-    ${OPENGL_LIBRARIES})
-  target_use_packages(p3glgsg CG)
-
-  install(TARGETS p3glgsg DESTINATION lib)
-  install(FILES ${P3GLGSG_HEADERS} DESTINATION include/panda3d)
+if(NOT HAVE_GL)
+  return()
 endif()
+
+set(P3GLGSG_HEADERS
+  config_glgsg.h glgsg.h
+)
+
+set(P3GLGSG_SOURCES
+  config_glgsg.cxx
+  glgsg.cxx
+)
+
+composite_sources(p3glgsg P3GLGSG_SOURCES)
+add_component_library(p3glgsg SYMBOL BUILDING_PANDAGL
+  ${P3GLGSG_HEADERS} ${P3GLGSG_SOURCES})
+target_link_libraries(p3glgsg p3glstuff panda
+  ${OPENGL_LIBRARIES})
+target_use_packages(p3glgsg CG)
+
+install(TARGETS p3glgsg DESTINATION lib)
+install(FILES ${P3GLGSG_HEADERS} DESTINATION include/panda3d)
diff --git a/panda/src/glstuff/CMakeLists.txt b/panda/src/glstuff/CMakeLists.txt
index 3919f79fd3..67af226c88 100644
--- a/panda/src/glstuff/CMakeLists.txt
+++ b/panda/src/glstuff/CMakeLists.txt
@@ -1,39 +1,41 @@
-if(HAVE_GL)
-  set(P3GLSTUFF_HEADERS
-     glGeomContext_src.I
-     glGeomContext_src.h
-     glGeomMunger_src.I
-     glGeomMunger_src.h
-     glGraphicsStateGuardian_src.I
-     glGraphicsStateGuardian_src.h
-     glGraphicsBuffer_src.I
-     glGraphicsBuffer_src.h
-     glImmediateModeSender_src.I
-     glImmediateModeSender_src.h
-     glIndexBufferContext_src.I
-     glIndexBufferContext_src.h
-     glOcclusionQueryContext_src.I
-     glOcclusionQueryContext_src.h
-     glShaderContext_src.I
-     glShaderContext_src.h
-     glTextureContext_src.I
-     glTextureContext_src.h
-     glVertexBufferContext_src.I
-     glVertexBufferContext_src.h
-     glmisc_src.h
-     glstuff_src.h
-     glstuff_undef_src.h
-     panda_glext.h
-  )
-
-  set(P3GLSTUFF_SOURCES
-    glpure.cxx
-  )
-
-  composite_sources(p3glstuff P3GLSTUFF_SOURCES)
-  add_component_library(p3glstuff ${P3GLSTUFF_HEADERS} ${P3GLSTUFF_SOURCES})
-  target_link_libraries(p3glstuff panda)
-
-  install(TARGETS p3glstuff DESTINATION lib)
-  install(FILES ${P3GLSTUFF_HEADERS} DESTINATION include/panda3d)
+if(NOT HAVE_GL)
+  return()
 endif()
+
+set(P3GLSTUFF_HEADERS
+   glGeomContext_src.I
+   glGeomContext_src.h
+   glGeomMunger_src.I
+   glGeomMunger_src.h
+   glGraphicsStateGuardian_src.I
+   glGraphicsStateGuardian_src.h
+   glGraphicsBuffer_src.I
+   glGraphicsBuffer_src.h
+   glImmediateModeSender_src.I
+   glImmediateModeSender_src.h
+   glIndexBufferContext_src.I
+   glIndexBufferContext_src.h
+   glOcclusionQueryContext_src.I
+   glOcclusionQueryContext_src.h
+   glShaderContext_src.I
+   glShaderContext_src.h
+   glTextureContext_src.I
+   glTextureContext_src.h
+   glVertexBufferContext_src.I
+   glVertexBufferContext_src.h
+   glmisc_src.h
+   glstuff_src.h
+   glstuff_undef_src.h
+   panda_glext.h
+)
+
+set(P3GLSTUFF_SOURCES
+  glpure.cxx
+)
+
+composite_sources(p3glstuff P3GLSTUFF_SOURCES)
+add_component_library(p3glstuff ${P3GLSTUFF_HEADERS} ${P3GLSTUFF_SOURCES})
+target_link_libraries(p3glstuff panda)
+
+install(TARGETS p3glstuff DESTINATION lib)
+install(FILES ${P3GLSTUFF_HEADERS} DESTINATION include/panda3d)
diff --git a/panda/src/glxdisplay/CMakeLists.txt b/panda/src/glxdisplay/CMakeLists.txt
index 473d20b2e8..adedecae49 100644
--- a/panda/src/glxdisplay/CMakeLists.txt
+++ b/panda/src/glxdisplay/CMakeLists.txt
@@ -1,29 +1,31 @@
-if(HAVE_GLX)
-  set(P3GLXDISPLAY_HEADERS
-    config_glxdisplay.h
-    glxGraphicsBuffer.h glxGraphicsBuffer.I
-    glxGraphicsPipe.h glxGraphicsPipe.I
-    glxGraphicsPixmap.h glxGraphicsPixmap.I
-    glxGraphicsWindow.h
-    glxGraphicsStateGuardian.h glxGraphicsStateGuardian.I
-    posixGraphicsStateGuardian.h posixGraphicsStateGuardian.I
-    panda_glxext.h
-  )
-
-  set(P3GLXDISPLAY_SOURCES
-    config_glxdisplay.cxx
-    glxGraphicsBuffer.cxx
-    glxGraphicsPipe.cxx
-    glxGraphicsPixmap.cxx
-    glxGraphicsWindow.cxx
-    glxGraphicsStateGuardian.cxx
-    posixGraphicsStateGuardian.cxx
-  )
-
-  composite_sources(p3glxdisplay P3GLXDISPLAY_SOURCES)
-  add_component_library(p3glxdisplay SYMBOL BUILDING_PANDAGL
-    ${P3GLXDISPLAY_HEADERS} ${P3GLXDISPLAY_SOURCES})
-  target_link_libraries(p3glxdisplay p3glgsg p3x11display)
-
-  install(TARGETS p3glxdisplay DESTINATION lib)
+if(NOT HAVE_GLX)
+  return()
 endif()
+
+set(P3GLXDISPLAY_HEADERS
+  config_glxdisplay.h
+  glxGraphicsBuffer.h glxGraphicsBuffer.I
+  glxGraphicsPipe.h glxGraphicsPipe.I
+  glxGraphicsPixmap.h glxGraphicsPixmap.I
+  glxGraphicsWindow.h
+  glxGraphicsStateGuardian.h glxGraphicsStateGuardian.I
+  posixGraphicsStateGuardian.h posixGraphicsStateGuardian.I
+  panda_glxext.h
+)
+
+set(P3GLXDISPLAY_SOURCES
+  config_glxdisplay.cxx
+  glxGraphicsBuffer.cxx
+  glxGraphicsPipe.cxx
+  glxGraphicsPixmap.cxx
+  glxGraphicsWindow.cxx
+  glxGraphicsStateGuardian.cxx
+  posixGraphicsStateGuardian.cxx
+)
+
+composite_sources(p3glxdisplay P3GLXDISPLAY_SOURCES)
+add_component_library(p3glxdisplay SYMBOL BUILDING_PANDAGL
+  ${P3GLXDISPLAY_HEADERS} ${P3GLXDISPLAY_SOURCES})
+target_link_libraries(p3glxdisplay p3glgsg p3x11display)
+
+install(TARGETS p3glxdisplay DESTINATION lib)
diff --git a/panda/src/nativenet/CMakeLists.txt b/panda/src/nativenet/CMakeLists.txt
index 4323082e87..2c2fc687ca 100644
--- a/panda/src/nativenet/CMakeLists.txt
+++ b/panda/src/nativenet/CMakeLists.txt
@@ -1,35 +1,37 @@
-if(WANT_NATIVE_NET)
-  set(P3NATIVENET_HEADERS
-      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_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
-      socket_udp_outgoing.h time_general.h)
-
-  set(P3NATIVENET_SOURCES
-      config_nativenet.cxx
-      buffered_datagramconnection.cxx
-      socket_address.cxx
-      socket_ip.cxx
-      socket_tcp.cxx
-      socket_tcp_listen.cxx
-      socket_tcp_ssl.cxx
-      socket_udp.cxx
-      socket_udp_incoming.cxx
-      socket_udp_outgoing.cxx)
-
-  composite_sources(p3nativenet P3NATIVENET_SOURCES)
-  add_component_library(p3nativenet SYMBOL BUILDING_PANDA_NATIVENET
-    ${P3NATIVENET_HEADERS} ${P3NATIVENET_SOURCES})
-  target_link_libraries(p3nativenet p3express p3pandabase p3downloader)
-  target_interrogate(p3nativenet ALL)
-
-  install(TARGETS p3nativenet DESTINATION lib)
-  install(FILES ${P3NATIVENET_HEADERS} DESTINATION include/panda3d)
+if(NOT WANT_NATIVE_NET)
+  return()
 endif()
+
+set(P3NATIVENET_HEADERS
+    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_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
+    socket_udp_outgoing.h time_general.h)
+
+set(P3NATIVENET_SOURCES
+    config_nativenet.cxx
+    buffered_datagramconnection.cxx
+    socket_address.cxx
+    socket_ip.cxx
+    socket_tcp.cxx
+    socket_tcp_listen.cxx
+    socket_tcp_ssl.cxx
+    socket_udp.cxx
+    socket_udp_incoming.cxx
+    socket_udp_outgoing.cxx)
+
+composite_sources(p3nativenet P3NATIVENET_SOURCES)
+add_component_library(p3nativenet SYMBOL BUILDING_PANDA_NATIVENET
+  ${P3NATIVENET_HEADERS} ${P3NATIVENET_SOURCES})
+target_link_libraries(p3nativenet p3express p3pandabase p3downloader)
+target_interrogate(p3nativenet ALL)
+
+install(TARGETS p3nativenet DESTINATION lib)
+install(FILES ${P3NATIVENET_HEADERS} DESTINATION include/panda3d)
diff --git a/panda/src/net/CMakeLists.txt b/panda/src/net/CMakeLists.txt
index 3f4dba403c..adc9f9f4ad 100644
--- a/panda/src/net/CMakeLists.txt
+++ b/panda/src/net/CMakeLists.txt
@@ -1,40 +1,42 @@
-if(HAVE_NET AND WANT_NATIVE_NET)
-  set(P3NET_HEADERS
-      config_net.h connection.h connectionListener.h
-      connectionManager.N connectionManager.h
-      connectionReader.I connectionReader.h
-      connectionWriter.h datagramQueue.h
-      datagramTCPHeader.I datagramTCPHeader.h
-      datagramUDPHeader.I datagramUDPHeader.h
-      netAddress.h netDatagram.I netDatagram.h
-      datagramGeneratorNet.I datagramGeneratorNet.h
-      datagramSinkNet.I datagramSinkNet.h
-      queuedConnectionListener.I
-      queuedConnectionListener.h queuedConnectionManager.h
-      queuedConnectionReader.h recentConnectionReader.h
-      queuedReturn.h queuedReturn.I)
-
-  set(P3NET_SOURCES
-      config_net.cxx connection.cxx connectionListener.cxx
-      connectionManager.cxx connectionReader.cxx
-      connectionWriter.cxx datagramQueue.cxx datagramTCPHeader.cxx
-      datagramUDPHeader.cxx netAddress.cxx netDatagram.cxx
-      datagramGeneratorNet.cxx
-      datagramSinkNet.cxx
-      queuedConnectionListener.cxx
-      queuedConnectionManager.cxx queuedConnectionReader.cxx
-      recentConnectionReader.cxx)
-
-  composite_sources(p3net P3NET_SOURCES)
-  add_component_library(p3net SYMBOL BUILDING_PANDA_NET
-    ${P3NET_HEADERS} ${P3NET_SOURCES})
-  target_link_libraries(p3net p3express p3downloader p3pandabase p3nativenet p3pipeline)
-  target_interrogate(p3net ALL)
-
-  if(WIN32)
-    target_link_libraries(p3net Iphlpapi.lib)
-  endif()
-
-  install(TARGETS p3net DESTINATION lib)
-  install(FILES ${P3NET_HEADERS} DESTINATION include/panda3d)
+if(NOT HAVE_NET OR NOT WANT_NATIVE_NET)
+  return()
 endif()
+
+set(P3NET_HEADERS
+    config_net.h connection.h connectionListener.h
+    connectionManager.N connectionManager.h
+    connectionReader.I connectionReader.h
+    connectionWriter.h datagramQueue.h
+    datagramTCPHeader.I datagramTCPHeader.h
+    datagramUDPHeader.I datagramUDPHeader.h
+    netAddress.h netDatagram.I netDatagram.h
+    datagramGeneratorNet.I datagramGeneratorNet.h
+    datagramSinkNet.I datagramSinkNet.h
+    queuedConnectionListener.I
+    queuedConnectionListener.h queuedConnectionManager.h
+    queuedConnectionReader.h recentConnectionReader.h
+    queuedReturn.h queuedReturn.I)
+
+set(P3NET_SOURCES
+    config_net.cxx connection.cxx connectionListener.cxx
+    connectionManager.cxx connectionReader.cxx
+    connectionWriter.cxx datagramQueue.cxx datagramTCPHeader.cxx
+    datagramUDPHeader.cxx netAddress.cxx netDatagram.cxx
+    datagramGeneratorNet.cxx
+    datagramSinkNet.cxx
+    queuedConnectionListener.cxx
+    queuedConnectionManager.cxx queuedConnectionReader.cxx
+    recentConnectionReader.cxx)
+
+composite_sources(p3net P3NET_SOURCES)
+add_component_library(p3net SYMBOL BUILDING_PANDA_NET
+  ${P3NET_HEADERS} ${P3NET_SOURCES})
+target_link_libraries(p3net p3express p3downloader p3pandabase p3nativenet p3pipeline)
+target_interrogate(p3net ALL)
+
+if(WIN32)
+  target_link_libraries(p3net Iphlpapi.lib)
+endif()
+
+install(TARGETS p3net DESTINATION lib)
+install(FILES ${P3NET_HEADERS} DESTINATION include/panda3d)
diff --git a/panda/src/ode/CMakeLists.txt b/panda/src/ode/CMakeLists.txt
index 7ac467ef7b..3206b722eb 100644
--- a/panda/src/ode/CMakeLists.txt
+++ b/panda/src/ode/CMakeLists.txt
@@ -1,93 +1,95 @@
-if(HAVE_ODE)
-  set(P3ODE_HEADERS
-      ode_includes.h config_ode.h
-      odeWorld.I odeWorld.h
-      odeMass.I odeMass.h
-      odeBody.I odeBody.h
-      odeJointGroup.I odeJointGroup.h
-      odeJoint.I odeJoint.h
-      odeUtil.h
-      odeSpace.I odeSpace.h
-      odeGeom.I odeGeom.h
-      odeSurfaceParameters.I odeSurfaceParameters.h
-      odeContactGeom.I odeContactGeom.h
-      odeContact.I odeContact.h
-      odeAMotorJoint.I odeAMotorJoint.h
-      odeBallJoint.I odeBallJoint.h
-      odeContactJoint.I odeContactJoint.h
-      odeFixedJoint.I odeFixedJoint.h
-      odeHingeJoint.I odeHingeJoint.h
-      odeHinge2Joint.I odeHinge2Joint.h
-      odeLMotorJoint.I odeLMotorJoint.h
-      odeNullJoint.I odeNullJoint.h
-      odePlane2dJoint.I odePlane2dJoint.h
-      odeSliderJoint.I odeSliderJoint.h
-      odeUniversalJoint.I odeUniversalJoint.h
-      odeJointCollection.I odeJointCollection.h
-      odeSimpleSpace.I odeSimpleSpace.h
-      odeHashSpace.I odeHashSpace.h
-      odeQuadTreeSpace.I odeQuadTreeSpace.h
-      odeSphereGeom.I odeSphereGeom.h
-      odeBoxGeom.I odeBoxGeom.h
-      odePlaneGeom.I odePlaneGeom.h
-      odeCappedCylinderGeom.I odeCappedCylinderGeom.h
-      odeCylinderGeom.I odeCylinderGeom.h
-      odeRayGeom.I odeRayGeom.h
-      odeTriMeshData.I odeTriMeshData.h
-      odeTriMeshGeom.I odeTriMeshGeom.h
-      odeCollisionEntry.I odeCollisionEntry.h
-      odeHelperStructs.h)
-
-  set(P3ODE_SOURCES
-      config_ode.cxx
-      odeWorld.cxx odeMass.cxx odeBody.cxx
-      odeJointGroup.cxx odeJoint.cxx
-      odeUtil.cxx
-      odeSpace.cxx
-      odeGeom.cxx
-      odeSurfaceParameters.cxx
-      odeContactGeom.cxx odeContact.cxx
-      odeAMotorJoint.cxx odeBallJoint.cxx
-      odeContactJoint.cxx odeFixedJoint.cxx
-      odeHingeJoint.cxx odeHinge2Joint.cxx
-      odeLMotorJoint.cxx odeNullJoint.cxx
-      odePlane2dJoint.cxx odeSliderJoint.cxx
-      odeUniversalJoint.cxx odeJointCollection.cxx
-      odeSimpleSpace.cxx
-      odeHashSpace.cxx odeQuadTreeSpace.cxx
-      odeSphereGeom.cxx odeBoxGeom.cxx
-      odePlaneGeom.cxx odeCappedCylinderGeom.cxx
-      odeCylinderGeom.cxx odeRayGeom.cxx
-      odeTriMeshData.cxx  odeTriMeshGeom.cxx
-      odeCollisionEntry.cxx)
-
-  set(P3ODE_IGATEEXT
-      odeBody_ext.h
-      odeBody_ext.I
-      odeGeom_ext.cxx
-      odeGeom_ext.h
-      odeGeom_ext.I
-      odeJoint_ext.cxx
-      odeJoint_ext.h
-      odeSpace_ext.cxx
-      odeSpace_ext.h
-      odeSpace_ext.I
-      odeUtil_ext.cxx
-      odeUtil_ext.h)
-
-  set(P3ODE_IGATE_SOURCES "${P3ODE_HEADERS};${P3ODE_SOURCES}")
-  list(REMOVE_ITEM P3ODE_IGATE_SOURCES "odeConvexGeom.h")
-  list(REMOVE_ITEM P3ODE_IGATE_SOURCES "odeHeightFieldGeom.h")
-  list(REMOVE_ITEM P3ODE_IGATE_SOURCES "odeHelperStructs.h")
-
-  composite_sources(p3ode P3ODE_SOURCES)
-  add_library(p3ode ${P3ODE_SOURCES} ${P3ODE_HEADERS})
-  set_target_properties(p3ode PROPERTIES DEFINE_SYMBOL BUILDING_PANDAODE)
-  target_compile_definitions(p3ode PUBLIC dSINGLE)
-  target_link_libraries(p3ode panda)
-  target_use_packages(p3ode ODE)
-  target_interrogate(p3ode ${P3ODE_IGATE_SOURCES} EXTENSIONS ${P3ODE_IGATEEXT})
-
-  install(TARGETS p3ode DESTINATION lib)
-  install(FILES ${P3ODE_HEADERS} DESTINATION include/panda3d)
+if(NOT HAVE_ODE)
+  return()
 endif()
+
+set(P3ODE_HEADERS
+    ode_includes.h config_ode.h
+    odeWorld.I odeWorld.h
+    odeMass.I odeMass.h
+    odeBody.I odeBody.h
+    odeJointGroup.I odeJointGroup.h
+    odeJoint.I odeJoint.h
+    odeUtil.h
+    odeSpace.I odeSpace.h
+    odeGeom.I odeGeom.h
+    odeSurfaceParameters.I odeSurfaceParameters.h
+    odeContactGeom.I odeContactGeom.h
+    odeContact.I odeContact.h
+    odeAMotorJoint.I odeAMotorJoint.h
+    odeBallJoint.I odeBallJoint.h
+    odeContactJoint.I odeContactJoint.h
+    odeFixedJoint.I odeFixedJoint.h
+    odeHingeJoint.I odeHingeJoint.h
+    odeHinge2Joint.I odeHinge2Joint.h
+    odeLMotorJoint.I odeLMotorJoint.h
+    odeNullJoint.I odeNullJoint.h
+    odePlane2dJoint.I odePlane2dJoint.h
+    odeSliderJoint.I odeSliderJoint.h
+    odeUniversalJoint.I odeUniversalJoint.h
+    odeJointCollection.I odeJointCollection.h
+    odeSimpleSpace.I odeSimpleSpace.h
+    odeHashSpace.I odeHashSpace.h
+    odeQuadTreeSpace.I odeQuadTreeSpace.h
+    odeSphereGeom.I odeSphereGeom.h
+    odeBoxGeom.I odeBoxGeom.h
+    odePlaneGeom.I odePlaneGeom.h
+    odeCappedCylinderGeom.I odeCappedCylinderGeom.h
+    odeCylinderGeom.I odeCylinderGeom.h
+    odeRayGeom.I odeRayGeom.h
+    odeTriMeshData.I odeTriMeshData.h
+    odeTriMeshGeom.I odeTriMeshGeom.h
+    odeCollisionEntry.I odeCollisionEntry.h
+    odeHelperStructs.h)
+
+set(P3ODE_SOURCES
+    config_ode.cxx
+    odeWorld.cxx odeMass.cxx odeBody.cxx
+    odeJointGroup.cxx odeJoint.cxx
+    odeUtil.cxx
+    odeSpace.cxx
+    odeGeom.cxx
+    odeSurfaceParameters.cxx
+    odeContactGeom.cxx odeContact.cxx
+    odeAMotorJoint.cxx odeBallJoint.cxx
+    odeContactJoint.cxx odeFixedJoint.cxx
+    odeHingeJoint.cxx odeHinge2Joint.cxx
+    odeLMotorJoint.cxx odeNullJoint.cxx
+    odePlane2dJoint.cxx odeSliderJoint.cxx
+    odeUniversalJoint.cxx odeJointCollection.cxx
+    odeSimpleSpace.cxx
+    odeHashSpace.cxx odeQuadTreeSpace.cxx
+    odeSphereGeom.cxx odeBoxGeom.cxx
+    odePlaneGeom.cxx odeCappedCylinderGeom.cxx
+    odeCylinderGeom.cxx odeRayGeom.cxx
+    odeTriMeshData.cxx  odeTriMeshGeom.cxx
+    odeCollisionEntry.cxx)
+
+set(P3ODE_IGATEEXT
+    odeBody_ext.h
+    odeBody_ext.I
+    odeGeom_ext.cxx
+    odeGeom_ext.h
+    odeGeom_ext.I
+    odeJoint_ext.cxx
+    odeJoint_ext.h
+    odeSpace_ext.cxx
+    odeSpace_ext.h
+    odeSpace_ext.I
+    odeUtil_ext.cxx
+    odeUtil_ext.h)
+
+set(P3ODE_IGATE_SOURCES "${P3ODE_HEADERS};${P3ODE_SOURCES}")
+list(REMOVE_ITEM P3ODE_IGATE_SOURCES "odeConvexGeom.h")
+list(REMOVE_ITEM P3ODE_IGATE_SOURCES "odeHeightFieldGeom.h")
+list(REMOVE_ITEM P3ODE_IGATE_SOURCES "odeHelperStructs.h")
+
+composite_sources(p3ode P3ODE_SOURCES)
+add_library(p3ode ${P3ODE_SOURCES} ${P3ODE_HEADERS})
+set_target_properties(p3ode PROPERTIES DEFINE_SYMBOL BUILDING_PANDAODE)
+target_compile_definitions(p3ode PUBLIC dSINGLE)
+target_link_libraries(p3ode panda)
+target_use_packages(p3ode ODE)
+target_interrogate(p3ode ${P3ODE_IGATE_SOURCES} EXTENSIONS ${P3ODE_IGATEEXT})
+
+install(TARGETS p3ode DESTINATION lib)
+install(FILES ${P3ODE_HEADERS} DESTINATION include/panda3d)
diff --git a/panda/src/osxdisplay/CMakeLists.txt b/panda/src/osxdisplay/CMakeLists.txt
index ac03c9620d..0d6026e9dd 100644
--- a/panda/src/osxdisplay/CMakeLists.txt
+++ b/panda/src/osxdisplay/CMakeLists.txt
@@ -1,28 +1,30 @@
-if(APPLE AND HAVE_GL AND HAVE_CARBON)
-  set(P3OSXDISPLAY_HEADERS
-      config_osxdisplay.h
-      osxGraphicsPipe.h
-      osxGraphicsWindow.h osxGraphicsWindow.I
-      osxGraphicsStateGuardian.h)
-
-  set(P3OSXDISPLAY_SOURCES
-      config_osxdisplay.cxx osxGraphicsPipe.cxx osxGraphicsStateGuardian.cxx
-      osxGraphicsBuffer.cxx)
-
-  composite_sources(p3osxdisplay P3OSXDISPLAY_SOURCES)
-  add_library(p3osxdisplay ${P3OSXDISPLAY_HEADERS} ${P3OSXDISPLAY_SOURCES})
-  set_target_properties(p3osxdisplay PROPERTIES DEFINE_SYMBOL BUILDING_PANDAGL)
-  target_link_libraries(p3osxdisplay p3display p3putil p3glgsg)
-
-  # Frameworks:
-  find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
-  find_library(CARBON_LIBRARY Carbon)
-  find_library(AGL_LIBRARY AGL)
-  find_library(CORESERVICES_LIBRARY CoreServices)
-  find_library(COCOA_LIBRARY Cocoa)
-  target_link_libraries(p3osxdisplay
-    ${APPLICATIONSERVICES_LIBRARY} ${CARBON_LIBRARY} ${AGL_LIBRARY}
-    ${CORESERVICES_LIBRARY} ${COCOA_LIBRARY})
-
-  install(TARGETS p3osxdisplay DESTINATION lib)
+if(NOT APPLE OR NOT HAVE_GL OR NOT HAVE_CARBON)
+  return()
 endif()
+
+set(P3OSXDISPLAY_HEADERS
+    config_osxdisplay.h
+    osxGraphicsPipe.h
+    osxGraphicsWindow.h osxGraphicsWindow.I
+    osxGraphicsStateGuardian.h)
+
+set(P3OSXDISPLAY_SOURCES
+    config_osxdisplay.cxx osxGraphicsPipe.cxx osxGraphicsStateGuardian.cxx
+    osxGraphicsBuffer.cxx)
+
+composite_sources(p3osxdisplay P3OSXDISPLAY_SOURCES)
+add_library(p3osxdisplay ${P3OSXDISPLAY_HEADERS} ${P3OSXDISPLAY_SOURCES})
+set_target_properties(p3osxdisplay PROPERTIES DEFINE_SYMBOL BUILDING_PANDAGL)
+target_link_libraries(p3osxdisplay p3display p3putil p3glgsg)
+
+# Frameworks:
+find_library(APPLICATIONSERVICES_LIBRARY ApplicationServices)
+find_library(CARBON_LIBRARY Carbon)
+find_library(AGL_LIBRARY AGL)
+find_library(CORESERVICES_LIBRARY CoreServices)
+find_library(COCOA_LIBRARY Cocoa)
+target_link_libraries(p3osxdisplay
+  ${APPLICATIONSERVICES_LIBRARY} ${CARBON_LIBRARY} ${AGL_LIBRARY}
+  ${CORESERVICES_LIBRARY} ${COCOA_LIBRARY})
+
+install(TARGETS p3osxdisplay DESTINATION lib)
diff --git a/panda/src/pnmtext/CMakeLists.txt b/panda/src/pnmtext/CMakeLists.txt
index 67713ae318..8d71405a12 100644
--- a/panda/src/pnmtext/CMakeLists.txt
+++ b/panda/src/pnmtext/CMakeLists.txt
@@ -1,26 +1,28 @@
-if(HAVE_FREETYPE)
-  set(P3PNMTEXT_HEADERS
-    config_pnmtext.h
-    freetypeFace.h freetypeFace.I
-    freetypeFont.h freetypeFont.I
-    pnmTextGlyph.h pnmTextGlyph.I
-    pnmTextMaker.h pnmTextMaker.I
-  )
-  set(P3PNMTEXT_SOURCES
-    config_pnmtext.cxx
-    freetypeFace.cxx
-    freetypeFont.cxx
-    pnmTextGlyph.cxx
-    pnmTextMaker.cxx
-  )
-
-  composite_sources(p3pnmtext P3PNMTEXT_SOURCES)
-  add_component_library(p3pnmtext SYMBOL BUILDING_PANDA_PNMTEXT
-    ${P3PNMTEXT_HEADERS} ${P3PNMTEXT_SOURCES})
-  target_link_libraries(p3pnmtext p3parametrics p3pnmimage)
-  target_use_packages(p3pnmtext FREETYPE)
-  target_interrogate(p3pnmtext ALL)
-
-  install(TARGETS p3pnmtext DESTINATION lib)
-  install(FILES ${P3PNMTEXT_HEADERS} DESTINATION include/panda3d)
+if(NOT HAVE_FREETYPE)
+  return()
 endif()
+
+set(P3PNMTEXT_HEADERS
+  config_pnmtext.h
+  freetypeFace.h freetypeFace.I
+  freetypeFont.h freetypeFont.I
+  pnmTextGlyph.h pnmTextGlyph.I
+  pnmTextMaker.h pnmTextMaker.I
+)
+set(P3PNMTEXT_SOURCES
+  config_pnmtext.cxx
+  freetypeFace.cxx
+  freetypeFont.cxx
+  pnmTextGlyph.cxx
+  pnmTextMaker.cxx
+)
+
+composite_sources(p3pnmtext P3PNMTEXT_SOURCES)
+add_component_library(p3pnmtext SYMBOL BUILDING_PANDA_PNMTEXT
+  ${P3PNMTEXT_HEADERS} ${P3PNMTEXT_SOURCES})
+target_link_libraries(p3pnmtext p3parametrics p3pnmimage)
+target_use_packages(p3pnmtext FREETYPE)
+target_interrogate(p3pnmtext ALL)
+
+install(TARGETS p3pnmtext DESTINATION lib)
+install(FILES ${P3PNMTEXT_HEADERS} DESTINATION include/panda3d)
diff --git a/panda/src/wgldisplay/CMakeLists.txt b/panda/src/wgldisplay/CMakeLists.txt
index 0370beadab..147e4b784a 100644
--- a/panda/src/wgldisplay/CMakeLists.txt
+++ b/panda/src/wgldisplay/CMakeLists.txt
@@ -1,22 +1,24 @@
-if(HAVE_WGL)
-  set(P3WGLDISPLAY_HEADERS
-      config_wgldisplay.h
-      wglGraphicsBuffer.I wglGraphicsBuffer.h
-      wglGraphicsPipe.I wglGraphicsPipe.h
-      wglGraphicsStateGuardian.I wglGraphicsStateGuardian.h
-      wglGraphicsWindow.I wglGraphicsWindow.h
-      wglext.h)
-
-  set(P3WGLDISPLAY_SOURCES
-      config_wgldisplay.cxx
-      wglGraphicsBuffer.cxx
-      wglGraphicsPipe.cxx
-      wglGraphicsStateGuardian.cxx
-      wglGraphicsWindow.cxx)
-
-
-  composite_sources(p3wgldisplay P3WGLDISPLAY_SOURCES)
-  add_library(p3wgldisplay ${P3WGLDISPLAY_HEADERS} ${P3WGLDISPLAY_SOURCES})
-  set_target_properties(p3wgldisplay PROPERTIES DEFINE_SYMBOL BUILDING_PANDAGL)
-  target_link_libraries(p3wgldisplay p3display p3putil p3windisplay p3glgsg)
+if(NOT HAVE_WGL)
+  return()
 endif()
+
+set(P3WGLDISPLAY_HEADERS
+    config_wgldisplay.h
+    wglGraphicsBuffer.I wglGraphicsBuffer.h
+    wglGraphicsPipe.I wglGraphicsPipe.h
+    wglGraphicsStateGuardian.I wglGraphicsStateGuardian.h
+    wglGraphicsWindow.I wglGraphicsWindow.h
+    wglext.h)
+
+set(P3WGLDISPLAY_SOURCES
+    config_wgldisplay.cxx
+    wglGraphicsBuffer.cxx
+    wglGraphicsPipe.cxx
+    wglGraphicsStateGuardian.cxx
+    wglGraphicsWindow.cxx)
+
+
+composite_sources(p3wgldisplay P3WGLDISPLAY_SOURCES)
+add_library(p3wgldisplay ${P3WGLDISPLAY_HEADERS} ${P3WGLDISPLAY_SOURCES})
+set_target_properties(p3wgldisplay PROPERTIES DEFINE_SYMBOL BUILDING_PANDAGL)
+target_link_libraries(p3wgldisplay p3display p3putil p3windisplay p3glgsg)
diff --git a/panda/src/windisplay/CMakeLists.txt b/panda/src/windisplay/CMakeLists.txt
index 92c5748301..363330d7e9 100644
--- a/panda/src/windisplay/CMakeLists.txt
+++ b/panda/src/windisplay/CMakeLists.txt
@@ -1,18 +1,19 @@
-if(WIN32)
-  set(P3WINDISPLAY_HEADERS
-      config_windisplay.h
-      winGraphicsPipe.I winGraphicsPipe.h
-      winGraphicsWindow.I winGraphicsWindow.h
-      winDetectDx.h)
-
-  set(P3WINDISPLAY_SOURCES
-      config_windisplay.cxx winGraphicsPipe.cxx
-      winGraphicsWindow.cxx
-      winDetectDx9.cxx)
-
-  composite_sources(p3windisplay P3WINDISPLAY_SOURCES)
-  add_library(p3windisplay ${P3WINDISPLAY_HEADERS} ${P3WINDISPLAY_SOURCES})
-  set_target_properties(p3windisplay PROPERTIES DEFINE_SYMBOL BUILDING_PANDAWIN)
-  target_link_libraries(p3windisplay p3display p3putil
-    Imm32.lib)
+if(NOT WIN32)
+  return()
 endif()
+
+set(P3WINDISPLAY_HEADERS
+    config_windisplay.h
+    winGraphicsPipe.I winGraphicsPipe.h
+    winGraphicsWindow.I winGraphicsWindow.h
+    winDetectDx.h)
+
+set(P3WINDISPLAY_SOURCES
+    config_windisplay.cxx winGraphicsPipe.cxx
+    winGraphicsWindow.cxx
+    winDetectDx9.cxx)
+
+composite_sources(p3windisplay P3WINDISPLAY_SOURCES)
+add_library(p3windisplay ${P3WINDISPLAY_HEADERS} ${P3WINDISPLAY_SOURCES})
+set_target_properties(p3windisplay PROPERTIES DEFINE_SYMBOL BUILDING_PANDAWIN)
+target_link_libraries(p3windisplay p3display p3putil Imm32.lib)
diff --git a/panda/src/x11display/CMakeLists.txt b/panda/src/x11display/CMakeLists.txt
index 2351bbedf4..21ae14c02a 100644
--- a/panda/src/x11display/CMakeLists.txt
+++ b/panda/src/x11display/CMakeLists.txt
@@ -1,17 +1,19 @@
-if(HAVE_X11)
-  set(P3X11DISPLAY_HEADERS
-    config_x11display.h x11GraphicsPipe.I x11GraphicsPipe.h
-    x11GraphicsWindow.h x11GraphicsWindow.I
-  )
-
-  set(P3X11DISPLAY_SOURCES
-    config_x11display.cxx x11GraphicsPipe.cxx x11GraphicsWindow.cxx
-  )
-
-  composite_sources(p3x11display P3X11DISPLAY_SOURCES)
-  add_library(p3x11display ${P3X11DISPLAY_HEADERS} ${P3X11DISPLAY_SOURCES})
-  set_target_properties(p3x11display PROPERTIES DEFINE_SYMBOL BUILDING_PANDAX11)
-  target_link_libraries(p3x11display panda ${X11_LIBRARIES})
-
-  install(TARGETS p3x11display DESTINATION lib)
+if(NOT HAVE_X11)
+  return()
 endif()
+
+set(P3X11DISPLAY_HEADERS
+  config_x11display.h x11GraphicsPipe.I x11GraphicsPipe.h
+  x11GraphicsWindow.h x11GraphicsWindow.I
+)
+
+set(P3X11DISPLAY_SOURCES
+  config_x11display.cxx x11GraphicsPipe.cxx x11GraphicsWindow.cxx
+)
+
+composite_sources(p3x11display P3X11DISPLAY_SOURCES)
+add_library(p3x11display ${P3X11DISPLAY_HEADERS} ${P3X11DISPLAY_SOURCES})
+set_target_properties(p3x11display PROPERTIES DEFINE_SYMBOL BUILDING_PANDAX11)
+target_link_libraries(p3x11display panda ${X11_LIBRARIES})
+
+install(TARGETS p3x11display DESTINATION lib)
diff --git a/pandatool/src/gtk-stats/CMakeLists.txt b/pandatool/src/gtk-stats/CMakeLists.txt
index 40561bd856..b976f805a4 100644
--- a/pandatool/src/gtk-stats/CMakeLists.txt
+++ b/pandatool/src/gtk-stats/CMakeLists.txt
@@ -1,38 +1,40 @@
-if(HAVE_GTK2 AND HAVE_NET)
-  set(GTKSTATS_HEADERS
-      gtkStatsChartMenu.h
-      gtkStatsGraph.h
-      gtkStatsLabel.h
-      gtkStatsLabelStack.h
-      gtkStatsMenuId.h
-      gtkStatsMonitor.h gtkStatsMonitor.I
-      gtkStatsPianoRoll.h
-      gtkStatsServer.h
-      gtkStatsStripChart.h)
-
-  set(GTKSTATS_SOURCES
-      gtkStats.cxx
-      gtkStatsChartMenu.cxx
-      gtkStatsGraph.cxx
-      gtkStatsLabel.cxx
-      gtkStatsLabelStack.cxx
-      gtkStatsMonitor.cxx
-      gtkStatsPianoRoll.cxx
-      gtkStatsServer.cxx
-      gtkStatsStripChart.cxx)
-
-  composite_sources(gtkstats GTKSTATS_SOURCES)
-  add_executable(gtkstats ${GTKSTATS_HEADERS} ${GTKSTATS_SOURCES})
-  target_link_libraries(gtkstats p3progbase p3pstatserver p3pystub)
-  target_use_packages(gtkstats GTK2)
-
-  # This program is NOT actually called gtkstats. It's pstats-gtk on Win32 and
-  # pstats everywhere else (as the Win32 GUI is not built).
-  if(WIN32)
-    set_target_properties(gtkstats PROPERTIES OUTPUT_NAME "pstats-gtk")
-  else()
-    set_target_properties(gtkstats PROPERTIES OUTPUT_NAME "pstats")
-  endif()
-
-  install(TARGETS gtkstats DESTINATION bin)
+if(NOT HAVE_GTK2 OR NOT HAVE_NET)
+  return()
 endif()
+
+set(GTKSTATS_HEADERS
+    gtkStatsChartMenu.h
+    gtkStatsGraph.h
+    gtkStatsLabel.h
+    gtkStatsLabelStack.h
+    gtkStatsMenuId.h
+    gtkStatsMonitor.h gtkStatsMonitor.I
+    gtkStatsPianoRoll.h
+    gtkStatsServer.h
+    gtkStatsStripChart.h)
+
+set(GTKSTATS_SOURCES
+    gtkStats.cxx
+    gtkStatsChartMenu.cxx
+    gtkStatsGraph.cxx
+    gtkStatsLabel.cxx
+    gtkStatsLabelStack.cxx
+    gtkStatsMonitor.cxx
+    gtkStatsPianoRoll.cxx
+    gtkStatsServer.cxx
+    gtkStatsStripChart.cxx)
+
+composite_sources(gtkstats GTKSTATS_SOURCES)
+add_executable(gtkstats ${GTKSTATS_HEADERS} ${GTKSTATS_SOURCES})
+target_link_libraries(gtkstats p3progbase p3pstatserver p3pystub)
+target_use_packages(gtkstats GTK2)
+
+# This program is NOT actually called gtkstats. It's pstats-gtk on Win32 and
+# pstats everywhere else (as the Win32 GUI is not built).
+if(WIN32)
+  set_target_properties(gtkstats PROPERTIES OUTPUT_NAME "pstats-gtk")
+else()
+  set_target_properties(gtkstats PROPERTIES OUTPUT_NAME "pstats")
+endif()
+
+install(TARGETS gtkstats DESTINATION bin)
diff --git a/pandatool/src/pstatserver/CMakeLists.txt b/pandatool/src/pstatserver/CMakeLists.txt
index a907785f91..d133fd0763 100644
--- a/pandatool/src/pstatserver/CMakeLists.txt
+++ b/pandatool/src/pstatserver/CMakeLists.txt
@@ -1,26 +1,28 @@
-if(HAVE_NET)
-  set(P3PSTATSERVER_HEADERS
-      pStatClientData.h pStatGraph.I
-      pStatGraph.h pStatListener.h pStatMonitor.I
-      pStatMonitor.h pStatPianoRoll.I
-      pStatPianoRoll.h pStatReader.h
-      pStatServer.h pStatStripChart.I
-      pStatStripChart.h pStatThreadData.I
-      pStatThreadData.h pStatView.I pStatView.h
-      pStatViewLevel.I pStatViewLevel.h)
-
-  set(P3PSTATSERVER_SOURCES
-      pStatClientData.cxx pStatGraph.cxx
-      pStatListener.cxx
-      pStatMonitor.cxx pStatPianoRoll.cxx
-      pStatReader.cxx pStatServer.cxx
-      pStatStripChart.cxx pStatThreadData.cxx
-      pStatView.cxx pStatViewLevel.cxx)
-
-  composite_sources(p3pstatserver P3PSTATSERVER_SOURCES)
-  add_library(p3pstatserver STATIC ${P3PSTATSERVER_HEADERS} ${P3PSTATSERVER_SOURCES})
-  target_link_libraries(p3pstatserver p3pandatoolbase panda)
-
-  # This is only needed for binaries in the pandatool package. It is not useful
-  # for user applications, so it is not installed.
+if(NOT HAVE_NET)
+  return()
 endif()
+
+set(P3PSTATSERVER_HEADERS
+    pStatClientData.h pStatGraph.I
+    pStatGraph.h pStatListener.h pStatMonitor.I
+    pStatMonitor.h pStatPianoRoll.I
+    pStatPianoRoll.h pStatReader.h
+    pStatServer.h pStatStripChart.I
+    pStatStripChart.h pStatThreadData.I
+    pStatThreadData.h pStatView.I pStatView.h
+    pStatViewLevel.I pStatViewLevel.h)
+
+set(P3PSTATSERVER_SOURCES
+    pStatClientData.cxx pStatGraph.cxx
+    pStatListener.cxx
+    pStatMonitor.cxx pStatPianoRoll.cxx
+    pStatReader.cxx pStatServer.cxx
+    pStatStripChart.cxx pStatThreadData.cxx
+    pStatView.cxx pStatViewLevel.cxx)
+
+composite_sources(p3pstatserver P3PSTATSERVER_SOURCES)
+add_library(p3pstatserver STATIC ${P3PSTATSERVER_HEADERS} ${P3PSTATSERVER_SOURCES})
+target_link_libraries(p3pstatserver p3pandatoolbase panda)
+
+# This is only needed for binaries in the pandatool package. It is not useful
+# for user applications, so it is not installed.