diff --git a/panda/CMakeLists.txt b/panda/CMakeLists.txt
index b7ca562f97..44fa45bc4a 100644
--- a/panda/CMakeLists.txt
+++ b/panda/CMakeLists.txt
@@ -12,6 +12,7 @@ add_subdirectory(src/pstatclient)
 add_subdirectory(src/linmath)
 add_subdirectory(src/event)
 
+add_subdirectory(src/mathutil)
 #add_subdirectory(src/gobj)
 #add_subdirectory(src/pgraph)
 #add_subdirectory(src/display)
diff --git a/panda/src/mathutil/CMakeLists.txt b/panda/src/mathutil/CMakeLists.txt
new file mode 100644
index 0000000000..b341bc84a2
--- /dev/null
+++ b/panda/src/mathutil/CMakeLists.txt
@@ -0,0 +1,96 @@
+set(P3GOBJ_HEADERS
+  boundingHexahedron.I boundingHexahedron.h boundingLine.I
+  boundingLine.h
+  boundingBox.I boundingBox.h
+  boundingPlane.I boundingPlane.h
+  boundingSphere.I boundingSphere.h
+  boundingVolume.I boundingVolume.h config_mathutil.h
+  fftCompressor.h finiteBoundingVolume.h frustum.h
+  frustum_src.I frustum_src.h geometricBoundingVolume.I
+  geometricBoundingVolume.h
+  intersectionBoundingVolume.h intersectionBoundingVolume.I
+  linmath_events.h
+  look_at.h look_at_src.I
+  look_at_src.h
+  linmath_events.h
+  mersenne.h
+  omniBoundingVolume.I
+  omniBoundingVolume.h
+  parabola.h parabola_src.I parabola_src.h
+  perlinNoise.h perlinNoise.I
+  perlinNoise2.h perlinNoise2.I
+  perlinNoise3.h perlinNoise3.I
+  plane.h plane_src.I plane_src.h
+  pta_LMatrix4.h pta_LMatrix3.h pta_LVecBase3.h
+  pta_LVecBase4.h pta_LVecBase2.h
+  randomizer.h randomizer.I
+  rotate_to.h
+  stackedPerlinNoise2.h stackedPerlinNoise2.I
+  stackedPerlinNoise3.h stackedPerlinNoise3.I
+  triangulator.h triangulator.I
+  triangulator3.h triangulator3.I
+  unionBoundingVolume.h unionBoundingVolume.I
+)
+
+set(P3GOBJ_SOURCES
+  boundingHexahedron.cxx boundingLine.cxx
+  boundingBox.cxx
+  boundingPlane.cxx
+  boundingSphere.cxx
+  boundingVolume.cxx config_mathutil.cxx fftCompressor.cxx
+  finiteBoundingVolume.cxx geometricBoundingVolume.cxx
+  intersectionBoundingVolume.cxx
+  look_at.cxx
+  linmath_events.cxx
+  mersenne.cxx
+  omniBoundingVolume.cxx
+  parabola.cxx
+  perlinNoise.cxx
+  perlinNoise2.cxx
+  perlinNoise3.cxx
+  plane.cxx
+  pta_LMatrix4.cxx pta_LMatrix3.cxx pta_LVecBase3.cxx
+  pta_LVecBase4.cxx pta_LVecBase2.cxx
+  randomizer.cxx
+  rotate_to.cxx
+  stackedPerlinNoise2.cxx
+  stackedPerlinNoise3.cxx
+  triangulator.cxx
+  triangulator3.cxx
+  unionBoundingVolume.cxx
+)
+
+if(HAVE_EIGEN)
+  include_directories(${EIGEN3_INCLUDE_DIR})
+endif()
+if(NOT HAVE_FFTW)
+  configure_file(../../../dtool/src/parser-inc/rfftw.h rfftw.h COPYONLY)
+endif()
+
+composite_sources(p3gobj P3GOBJ_SOURCES)
+add_library(p3gobj ${P3GOBJ_HEADERS} ${P3GOBJ_SOURCES})
+target_link_libraries(p3gobj p3event ${FFTW_LIBRARY_DIR})
+target_interrogate(p3gobj ALL)
+
+#begin test_bin_target
+  #define TARGET test_mathutil
+  #define LOCAL_LIBS \
+#    p3mathutil p3pipeline
+  #define OTHER_LIBS $[OTHER_LIBS] p3pystub
+
+  #define SOURCES \
+#    test_mathutil.cxx
+
+#end test_bin_target
+
+
+#begin test_bin_target
+  #define TARGET test_tri
+  #define LOCAL_LIBS \
+#    p3mathutil p3pipeline
+  #define OTHER_LIBS $[OTHER_LIBS] p3pystub
+
+  #define SOURCES \
+#    test_tri.cxx
+
+#end test_bin_target