CMake: Update pandatool CMakeLists.txt files for style consistency

This commit is contained in:
Sam Edwards 2018-10-28 02:00:03 -06:00
parent f07b713e8d
commit 6760c1366d
11 changed files with 201 additions and 163 deletions

View File

@ -1,9 +1,14 @@
set(P3CONVERTER_HEADERS set(P3CONVERTER_HEADERS
somethingToEggConverter.I somethingToEggConverter.h somethingToEggConverter.h somethingToEggConverter.I
eggToSomethingConverter.I eggToSomethingConverter.h) eggToSomethingConverter.h eggToSomethingConverter.I
)
set(P3CONVERTER_SOURCES set(P3CONVERTER_SOURCES
somethingToEggConverter.cxx eggToSomethingConverter.cxx) somethingToEggConverter.cxx eggToSomethingConverter.cxx
)
add_library(p3converter STATIC ${P3CONVERTER_HEADERS} ${P3CONVERTER_SOURCES}) add_library(p3converter STATIC ${P3CONVERTER_HEADERS} ${P3CONVERTER_SOURCES})
target_link_libraries(p3converter p3pandatoolbase pandaegg) 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.

View File

@ -1,9 +1,12 @@
set(P3CVSCOPY_HEADERS set(P3CVSCOPY_HEADERS
cvsCopy.h cvsSourceDirectory.h cvsSourceTree.h) cvsCopy.h cvsSourceDirectory.h cvsSourceTree.h
)
set(P3CVSCOPY_SOURCES 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}) add_library(p3cvscopy STATIC ${P3CVSCOPY_HEADERS} ${P3CVSCOPY_SOURCES})
target_link_libraries(p3cvscopy p3progbase) target_link_libraries(p3cvscopy p3progbase)

View File

@ -2,14 +2,19 @@ set(P3DXF_HEADERS
dxfFile.h dxfFile.h
dxfLayer.h dxfLayer.h
dxfLayerMap.h dxfLayerMap.h
dxfVertex.h) dxfVertex.h
)
set(P3DXF_SOURCES set(P3DXF_SOURCES
dxfFile.cxx dxfFile.cxx
dxfLayer.cxx dxfLayer.cxx
dxfLayerMap.cxx dxfLayerMap.cxx
dxfVertex.cxx) dxfVertex.cxx
)
composite_sources(p3dxf P3DXF_SOURCES) composite_sources(p3dxf P3DXF_SOURCES)
add_library(p3dxf STATIC ${P3DXF_HEADERS} ${P3DXF_SOURCES}) add_library(p3dxf STATIC ${P3DXF_HEADERS} ${P3DXF_SOURCES})
target_link_libraries(p3dxf p3pandatoolbase) 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.

View File

@ -1,13 +1,15 @@
set(P3DXFEGG_HEADERS set(P3DXFEGG_HEADERS
dxfToEggConverter.h dxfToEggConverter.h
dxfToEggLayer.h) dxfToEggLayer.h
)
set(P3DXFEGG_SOURCES set(P3DXFEGG_SOURCES
dxfToEggConverter.cxx dxfToEggConverter.cxx
dxfToEggLayer.cxx) dxfToEggLayer.cxx
)
add_library(p3dxfegg STATIC ${P3DXFEGG_HEADERS} ${P3DXFEGG_SOURCES}) 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 # This is only needed for binaries in the pandatool package. It is not useful
# for user applications, so it is not installed. # for user applications, so it is not installed.

View File

@ -4,7 +4,8 @@ set(P3EGGBASE_HEADERS
eggMultiBase.h eggMultiFilter.h eggMultiBase.h eggMultiFilter.h
eggReader.h eggSingleBase.h eggReader.h eggSingleBase.h
eggToSomething.h eggWriter.h eggToSomething.h eggWriter.h
somethingToEgg.h) somethingToEgg.h
)
set(P3EGGBASE_SOURCES set(P3EGGBASE_SOURCES
eggBase.cxx eggConverter.cxx eggFilter.cxx eggBase.cxx eggConverter.cxx eggFilter.cxx
@ -12,8 +13,12 @@ set(P3EGGBASE_SOURCES
eggMultiBase.cxx eggMultiBase.cxx
eggMultiFilter.cxx eggReader.cxx eggSingleBase.cxx eggMultiFilter.cxx eggReader.cxx eggSingleBase.cxx
eggToSomething.cxx eggToSomething.cxx
eggWriter.cxx somethingToEgg.cxx) eggWriter.cxx somethingToEgg.cxx
)
composite_sources(p3eggbase P3EGGBASE_SOURCES) composite_sources(p3eggbase P3EGGBASE_SOURCES)
add_library(p3eggbase STATIC ${P3EGGBASE_HEADERS} ${P3EGGBASE_SOURCES}) add_library(p3eggbase STATIC ${P3EGGBASE_HEADERS} ${P3EGGBASE_SOURCES})
target_link_libraries(p3eggbase p3progbase p3converter) 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.

View File

@ -2,26 +2,26 @@ set(P3FLT_HEADERS
config_flt.h config_flt.h
fltBead.h fltBead.h
fltBeadID.h fltBeadID.h
fltCurve.I fltCurve.h fltCurve.h fltCurve.I
fltError.h fltError.h
fltExternalReference.h fltExternalReference.h
fltEyepoint.h fltEyepoint.h
fltFace.I fltFace.h fltFace.h fltFace.I
fltGeometry.I fltGeometry.h fltGeometry.h fltGeometry.I
fltGroup.h fltGroup.h
fltHeader.h fltHeader.h
fltInstanceDefinition.h fltInstanceDefinition.h
fltInstanceRef.h fltInstanceRef.h
fltLightSourceDefinition.h fltLightSourceDefinition.h
fltLocalVertexPool.I fltLocalVertexPool.h fltLocalVertexPool.h fltLocalVertexPool.I
fltLOD.h fltLOD.h
fltMaterial.h fltMaterial.h
fltMesh.I fltMesh.h fltMesh.h fltMesh.I
fltMeshPrimitive.I fltMeshPrimitive.h fltMeshPrimitive.h fltMeshPrimitive.I
fltObject.h fltObject.h
fltOpcode.h fltOpcode.h
fltPackedColor.I fltPackedColor.h fltPackedColor.h fltPackedColor.I
fltRecord.I fltRecord.h fltRecord.h fltRecord.I
fltRecordReader.h fltRecordReader.h
fltRecordWriter.h fltRecordWriter.h
fltTexture.h fltTexture.h
@ -36,8 +36,9 @@ set(P3FLT_HEADERS
fltTransformTranslate.h fltTransformTranslate.h
fltUnsupportedRecord.h fltUnsupportedRecord.h
fltVectorRecord.h fltVectorRecord.h
fltVertex.I fltVertex.h fltVertex.h fltVertex.I
fltVertexList.h) fltVertexList.h
)
set(P3FLT_SOURCES set(P3FLT_SOURCES
config_flt.cxx config_flt.cxx
@ -78,8 +79,12 @@ set(P3FLT_SOURCES
fltUnsupportedRecord.cxx fltUnsupportedRecord.cxx
fltVectorRecord.cxx fltVectorRecord.cxx
fltVertex.cxx fltVertex.cxx
fltVertexList.cxx) fltVertexList.cxx
)
composite_sources(p3flt P3FLT_SOURCES) composite_sources(p3flt P3FLT_SOURCES)
add_library(p3flt STATIC ${P3FLT_HEADERS} ${P3FLT_SOURCES}) add_library(p3flt STATIC ${P3FLT_HEADERS} ${P3FLT_SOURCES})
target_link_libraries(p3flt p3pandatoolbase panda) 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.

View File

@ -1,13 +1,15 @@
set(P3FLTEGG_HEADERS set(P3FLTEGG_HEADERS
fltToEggConverter.I fltToEggConverter.h fltToEggConverter.h fltToEggConverter.I
fltToEggLevelState.I fltToEggLevelState.h) fltToEggLevelState.h fltToEggLevelState.I
)
set(P3FLTEGG_SOURCES set(P3FLTEGG_SOURCES
fltToEggConverter.cxx fltToEggConverter.cxx
fltToEggLevelState.cxx) fltToEggLevelState.cxx
)
add_library(p3fltegg STATIC ${P3FLTEGG_HEADERS} ${P3FLTEGG_SOURCES}) 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 # This is only needed for binaries in the pandatool package. It is not useful
# for user applications, so it is not installed. # for user applications, so it is not installed.

View File

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

View File

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

View File

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

View File

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