CMake: Update pandatool CMakeLists.txt files for style consistency

pandatool/src/converter/CMakeLists.txt

@@ -1,9 +1,14 @@
 set(P3CONVERTER_HEADERS
-    somethingToEggConverter.I somethingToEggConverter.h
-    eggToSomethingConverter.I eggToSomethingConverter.h)
+  somethingToEggConverter.h somethingToEggConverter.I
+  eggToSomethingConverter.h eggToSomethingConverter.I
+)
 
 set(P3CONVERTER_SOURCES
-    somethingToEggConverter.cxx eggToSomethingConverter.cxx)
+  somethingToEggConverter.cxx eggToSomethingConverter.cxx
+)
 
 add_library(p3converter STATIC ${P3CONVERTER_HEADERS} ${P3CONVERTER_SOURCES})
 target_link_libraries(p3converter p3pandatoolbase pandaegg)
+
+# This is only needed for binaries in the pandatool package. It is not useful
+# for user applications, so it is not installed.

pandatool/src/cvscopy/CMakeLists.txt

@@ -1,9 +1,12 @@
 set(P3CVSCOPY_HEADERS
-    cvsCopy.h cvsSourceDirectory.h cvsSourceTree.h)
+  cvsCopy.h cvsSourceDirectory.h cvsSourceTree.h
+)
 
 set(P3CVSCOPY_SOURCES
-    cvsCopy.cxx cvsSourceDirectory.cxx cvsSourceTree.cxx)
+  cvsCopy.cxx cvsSourceDirectory.cxx cvsSourceTree.cxx
+)
 
+composite_sources(p3cvscopy P3CVSCOPY_SOURCES)
 add_library(p3cvscopy STATIC ${P3CVSCOPY_HEADERS} ${P3CVSCOPY_SOURCES})
 target_link_libraries(p3cvscopy p3progbase)
 

pandatool/src/dxf/CMakeLists.txt

@@ -2,14 +2,19 @@ set(P3DXF_HEADERS
   dxfFile.h
   dxfLayer.h
   dxfLayerMap.h
-    dxfVertex.h)
+  dxfVertex.h
+)
 
 set(P3DXF_SOURCES
   dxfFile.cxx
   dxfLayer.cxx
   dxfLayerMap.cxx
-    dxfVertex.cxx)
+  dxfVertex.cxx
+)
 
 composite_sources(p3dxf P3DXF_SOURCES)
 add_library(p3dxf STATIC ${P3DXF_HEADERS} ${P3DXF_SOURCES})
 target_link_libraries(p3dxf p3pandatoolbase)
+
+# This is only needed for binaries in the pandatool package. It is not useful
+# for user applications, so it is not installed.

pandatool/src/dxfegg/CMakeLists.txt

@@ -1,13 +1,15 @@
 set(P3DXFEGG_HEADERS
   dxfToEggConverter.h
-    dxfToEggLayer.h)
+  dxfToEggLayer.h
+)
 
 set(P3DXFEGG_SOURCES
   dxfToEggConverter.cxx
-    dxfToEggLayer.cxx)
+  dxfToEggLayer.cxx
+)
 
 add_library(p3dxfegg STATIC ${P3DXFEGG_HEADERS} ${P3DXFEGG_SOURCES})
-target_link_libraries(p3dxfegg p3dxf p3converter)
+target_link_libraries(p3dxfegg p3dxf p3eggbase)
 
 # This is only needed for binaries in the pandatool package. It is not useful
 # for user applications, so it is not installed.

pandatool/src/eggbase/CMakeLists.txt

@@ -4,7 +4,8 @@ set(P3EGGBASE_HEADERS
   eggMultiBase.h eggMultiFilter.h
   eggReader.h eggSingleBase.h
   eggToSomething.h eggWriter.h
-    somethingToEgg.h)
+  somethingToEgg.h
+)
 
 set(P3EGGBASE_SOURCES
   eggBase.cxx eggConverter.cxx eggFilter.cxx
@@ -12,8 +13,12 @@ set(P3EGGBASE_SOURCES
   eggMultiBase.cxx
   eggMultiFilter.cxx eggReader.cxx eggSingleBase.cxx
   eggToSomething.cxx
-    eggWriter.cxx somethingToEgg.cxx)
+  eggWriter.cxx somethingToEgg.cxx
+)
 
 composite_sources(p3eggbase P3EGGBASE_SOURCES)
 add_library(p3eggbase STATIC ${P3EGGBASE_HEADERS} ${P3EGGBASE_SOURCES})
 target_link_libraries(p3eggbase p3progbase p3converter)
+
+# This is only needed for binaries in the pandatool package. It is not useful
+# for user applications, so it is not installed.

pandatool/src/flt/CMakeLists.txt

@@ -2,26 +2,26 @@ set(P3FLT_HEADERS
   config_flt.h
   fltBead.h
   fltBeadID.h
-    fltCurve.I fltCurve.h
+  fltCurve.h fltCurve.I
   fltError.h
   fltExternalReference.h
   fltEyepoint.h
-    fltFace.I fltFace.h
-    fltGeometry.I fltGeometry.h
+  fltFace.h fltFace.I
+  fltGeometry.h fltGeometry.I
   fltGroup.h
   fltHeader.h
   fltInstanceDefinition.h
   fltInstanceRef.h
   fltLightSourceDefinition.h
-    fltLocalVertexPool.I fltLocalVertexPool.h
+  fltLocalVertexPool.h fltLocalVertexPool.I
   fltLOD.h
   fltMaterial.h
-    fltMesh.I fltMesh.h
-    fltMeshPrimitive.I fltMeshPrimitive.h
+  fltMesh.h fltMesh.I
+  fltMeshPrimitive.h fltMeshPrimitive.I
   fltObject.h
   fltOpcode.h
-    fltPackedColor.I fltPackedColor.h
-    fltRecord.I fltRecord.h
+  fltPackedColor.h fltPackedColor.I
+  fltRecord.h fltRecord.I
   fltRecordReader.h
   fltRecordWriter.h
   fltTexture.h
@@ -36,8 +36,9 @@ set(P3FLT_HEADERS
   fltTransformTranslate.h
   fltUnsupportedRecord.h
   fltVectorRecord.h
-    fltVertex.I fltVertex.h
-    fltVertexList.h)
+  fltVertex.h fltVertex.I
+  fltVertexList.h
+)
 
 set(P3FLT_SOURCES
   config_flt.cxx
@@ -78,8 +79,12 @@ set(P3FLT_SOURCES
   fltUnsupportedRecord.cxx
   fltVectorRecord.cxx
   fltVertex.cxx
-    fltVertexList.cxx)
+  fltVertexList.cxx
+)
 
 composite_sources(p3flt P3FLT_SOURCES)
 add_library(p3flt STATIC ${P3FLT_HEADERS} ${P3FLT_SOURCES})
 target_link_libraries(p3flt p3pandatoolbase panda)
+
+# This is only needed for binaries in the pandatool package. It is not useful
+# for user applications, so it is not installed.

pandatool/src/fltegg/CMakeLists.txt

@@ -1,13 +1,15 @@
 set(P3FLTEGG_HEADERS
-    fltToEggConverter.I fltToEggConverter.h
-    fltToEggLevelState.I fltToEggLevelState.h)
+  fltToEggConverter.h fltToEggConverter.I
+  fltToEggLevelState.h fltToEggLevelState.I
+)
 
 set(P3FLTEGG_SOURCES
   fltToEggConverter.cxx
-    fltToEggLevelState.cxx)
+  fltToEggLevelState.cxx
+)
 
 add_library(p3fltegg STATIC ${P3FLTEGG_HEADERS} ${P3FLTEGG_SOURCES})
-target_link_libraries(p3fltegg p3flt p3converter)
+target_link_libraries(p3fltegg p3flt p3eggbase)
 
 # This is only needed for binaries in the pandatool package. It is not useful
 # for user applications, so it is not installed.

pandatool/src/gtk-stats/CMakeLists.txt

@@ -11,7 +11,8 @@ set(GTKSTATS_HEADERS
   gtkStatsMonitor.h gtkStatsMonitor.I
   gtkStatsPianoRoll.h
   gtkStatsServer.h
-    gtkStatsStripChart.h)
+  gtkStatsStripChart.h
+)
 
 set(GTKSTATS_SOURCES
   gtkStats.cxx
@@ -22,7 +23,8 @@ set(GTKSTATS_SOURCES
   gtkStatsMonitor.cxx
   gtkStatsPianoRoll.cxx
   gtkStatsServer.cxx
-    gtkStatsStripChart.cxx)
+  gtkStatsStripChart.cxx
+)
 
 composite_sources(gtkstats GTKSTATS_SOURCES)
 add_executable(gtkstats ${GTKSTATS_HEADERS} ${GTKSTATS_SOURCES})

pandatool/src/pandatoolbase/CMakeLists.txt

@@ -3,8 +3,9 @@ set(P3PANDATOOLBASE_HEADERS
   config_pandatoolbase.h
   distanceUnit.h
   pandatoolbase.h pandatoolsymbols.h
-    pathReplace.I pathReplace.h
-    pathStore.h)
+  pathReplace.h pathReplace.I
+  pathStore.h
+)
 
 set(P3PANDATOOLBASE_SOURCES
   animationConvert.cxx
@@ -12,7 +13,8 @@ set(P3PANDATOOLBASE_SOURCES
   distanceUnit.cxx
   pandatoolbase.cxx
   pathReplace.cxx
-    pathStore.cxx)
+  pathStore.cxx
+)
 
 composite_sources(p3pandatoolbase P3PANDATOOLBASE_SOURCES)
 add_library(p3pandatoolbase STATIC ${P3PANDATOOLBASE_HEADERS} ${P3PANDATOOLBASE_SOURCES})

pandatool/src/progbase/CMakeLists.txt

@@ -1,12 +1,14 @@
 set(P3PROGBASE_HEADERS
-    programBase.I programBase.h
-    withOutputFile.I withOutputFile.h
+  programBase.h programBase.I
+  withOutputFile.h withOutputFile.I
   wordWrapStream.h wordWrapStreamBuf.I
-    wordWrapStreamBuf.h)
+  wordWrapStreamBuf.h
+)
 
 set(P3PROGBASE_SOURCES
   programBase.cxx withOutputFile.cxx wordWrapStream.cxx
-    wordWrapStreamBuf.cxx)
+  wordWrapStreamBuf.cxx
+)
 
 composite_sources(p3progbase P3PROGBASE_SOURCES)
 add_library(p3progbase STATIC ${P3PROGBASE_HEADERS} ${P3PROGBASE_SOURCES})

pandatool/src/pstatserver/CMakeLists.txt

@@ -3,14 +3,18 @@ if(NOT HAVE_NET)
 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)
+  pStatClientData.h
+  pStatGraph.h pStatGraph.I
+  pStatListener.h
+  pStatMonitor.h pStatMonitor.I
+  pStatPianoRoll.h pStatPianoRoll.I
+  pStatReader.h
+  pStatServer.h
+  pStatStripChart.h pStatStripChart.I
+  pStatThreadData.h pStatThreadData.I
+  pStatView.h pStatView.I
+  pStatViewLevel.h pStatViewLevel.I
+)
 
 set(P3PSTATSERVER_SOURCES
   pStatClientData.cxx pStatGraph.cxx
@@ -18,7 +22,8 @@ set(P3PSTATSERVER_SOURCES
   pStatMonitor.cxx pStatPianoRoll.cxx
   pStatReader.cxx pStatServer.cxx
   pStatStripChart.cxx pStatThreadData.cxx
-    pStatView.cxx pStatViewLevel.cxx)
+  pStatView.cxx pStatViewLevel.cxx
+)
 
 composite_sources(p3pstatserver P3PSTATSERVER_SOURCES)
 add_library(p3pstatserver STATIC ${P3PSTATSERVER_HEADERS} ${P3PSTATSERVER_SOURCES})