CMake: Sort direct/dtool/panda/pandatool subdirectories

This forces us to make sure the inter-target dependencies work
in an order-independent way.

direct/CMakeLists.txt

@@ -3,12 +3,12 @@ if(NOT BUILD_PANDA)
 endif()
 
 # Include source directories which have C++ components:
-add_subdirectory(src/directbase)
-add_subdirectory(src/dcparser)
 add_subdirectory(src/dcparse)
+add_subdirectory(src/dcparser)
 add_subdirectory(src/deadrec)
-#add_subdirectory(src/directdServer)
+add_subdirectory(src/directbase)
 #add_subdirectory(src/directd)
+#add_subdirectory(src/directdServer)
 add_subdirectory(src/distributed)
 add_subdirectory(src/interval)
 add_subdirectory(src/motiontrail)

dtool/CMakeLists.txt

@@ -2,14 +2,14 @@
 include(LocalSetup.cmake)
 
 # Include dtool source directories
+add_subdirectory(src/cppparser)
+add_subdirectory(src/dconfig)
 add_subdirectory(src/dtoolbase)
 add_subdirectory(src/dtoolutil)
+add_subdirectory(src/interrogate)
+add_subdirectory(src/interrogatedb)
 add_subdirectory(src/prc)
-add_subdirectory(src/dconfig)
 add_subdirectory(src/pystub)
-add_subdirectory(src/cppparser)
-add_subdirectory(src/interrogatedb)
-add_subdirectory(src/interrogate)
 
 # Include dtool metalibs
 add_subdirectory(metalibs/dtool)

panda/CMakeLists.txt

@@ -3,71 +3,71 @@ if(NOT BUILD_DTOOL)
 endif()
 
 # Include panda source directories
+add_subdirectory(src/audio)
+add_subdirectory(src/audiotraits)
+add_subdirectory(src/chan)
+add_subdirectory(src/char)
+add_subdirectory(src/cocoadisplay)
+add_subdirectory(src/collide)
 add_subdirectory(src/configfiles)
-add_subdirectory(src/pandabase)
-add_subdirectory(src/express)
-add_subdirectory(src/dxml)
-add_subdirectory(src/pipeline)
+add_subdirectory(src/cull)
+add_subdirectory(src/device)
+add_subdirectory(src/dgraph)
+add_subdirectory(src/display)
 add_subdirectory(src/downloader)
 add_subdirectory(src/downloadertools)
-add_subdirectory(src/nativenet)
-add_subdirectory(src/net)
-add_subdirectory(src/linmath)
-add_subdirectory(src/putil)
-add_subdirectory(src/pstatclient)
+add_subdirectory(src/dxml)
+add_subdirectory(src/egg)
+add_subdirectory(src/egg2pg)
 add_subdirectory(src/event)
-add_subdirectory(src/mathutil)
-add_subdirectory(src/gsgbase)
-add_subdirectory(src/pnmimage)
-add_subdirectory(src/pnmimagetypes)
-add_subdirectory(src/gobj)
-add_subdirectory(src/pgraph)
-add_subdirectory(src/pgraphnodes)
-add_subdirectory(src/cull)
-add_subdirectory(src/display)
-add_subdirectory(src/glstuff)
+add_subdirectory(src/express)
+add_subdirectory(src/ffmpeg)
+add_subdirectory(src/framework)
 add_subdirectory(src/glgsg)
-add_subdirectory(src/x11display)
+add_subdirectory(src/glstuff)
 add_subdirectory(src/glxdisplay)
-add_subdirectory(src/windisplay)
-add_subdirectory(src/wgldisplay)
-add_subdirectory(src/osxdisplay)
-add_subdirectory(src/cocoadisplay)
+add_subdirectory(src/gobj)
+add_subdirectory(src/grutil)
+add_subdirectory(src/gsgbase)
+add_subdirectory(src/linmath)
+add_subdirectory(src/mathutil)
 add_subdirectory(src/movies)
-add_subdirectory(src/ffmpeg)
-add_subdirectory(src/audio)
-add_subdirectory(src/audiotraits)
-add_subdirectory(src/chan)
-add_subdirectory(src/char)
-add_subdirectory(src/dgraph)
-add_subdirectory(src/device)
+add_subdirectory(src/nativenet)
+add_subdirectory(src/net)
+add_subdirectory(src/osxdisplay)
+add_subdirectory(src/pandabase)
 add_subdirectory(src/parametrics)
-add_subdirectory(src/pnmtext)
-add_subdirectory(src/text)
-add_subdirectory(src/grutil)
-add_subdirectory(src/tform)
+add_subdirectory(src/pgraph)
+add_subdirectory(src/pgraphnodes)
 add_subdirectory(src/pgui)
+add_subdirectory(src/pipeline)
+add_subdirectory(src/pnmimage)
+add_subdirectory(src/pnmimagetypes)
+add_subdirectory(src/pnmtext)
+add_subdirectory(src/pstatclient)
+add_subdirectory(src/putil)
 add_subdirectory(src/recorder)
-add_subdirectory(src/collide)
-add_subdirectory(src/egg)
-add_subdirectory(src/egg2pg)
-add_subdirectory(src/framework)
 add_subdirectory(src/testbed)
+add_subdirectory(src/text)
+add_subdirectory(src/tform)
+add_subdirectory(src/wgldisplay)
+add_subdirectory(src/windisplay)
+add_subdirectory(src/x11display)
 
 # For other components
-# physics
-add_subdirectory(src/physics)
-add_subdirectory(src/particlesystem)
 # bullet
 add_subdirectory(src/bullet)
 # ode
 add_subdirectory(src/ode)
+# physics
+add_subdirectory(src/particlesystem)
+add_subdirectory(src/physics)
 
 # Include panda metalibs
 add_subdirectory(metalibs/panda)
+add_subdirectory(metalibs/pandaegg)
 add_subdirectory(metalibs/pandaexpress)
 add_subdirectory(metalibs/pandagl)
-add_subdirectory(metalibs/pandaegg)
 add_subdirectory(metalibs/pandaphysics)
 
 # Now add the Python modules:

pandatool/CMakeLists.txt

@@ -3,17 +3,17 @@ if(NOT BUILD_PANDA)
 endif()
 
 # Include pandatool source directories
-add_subdirectory(src/pandatoolbase)
-add_subdirectory(src/progbase)
+add_subdirectory(src/bam)
 add_subdirectory(src/converter)
 add_subdirectory(src/cvscopy)
+add_subdirectory(src/dxf)
+add_subdirectory(src/dxfegg)
+add_subdirectory(src/dxfprogs)
 add_subdirectory(src/eggbase)
-add_subdirectory(src/bam)
 add_subdirectory(src/flt)
 add_subdirectory(src/fltegg)
 add_subdirectory(src/fltprogs)
-add_subdirectory(src/dxf)
-add_subdirectory(src/dxfegg)
-add_subdirectory(src/dxfprogs)
-add_subdirectory(src/pstatserver)
 add_subdirectory(src/gtk-stats)
+add_subdirectory(src/pandatoolbase)
+add_subdirectory(src/progbase)
+add_subdirectory(src/pstatserver)