diff --git a/panda/CMakeLists.txt b/panda/CMakeLists.txt
index f4fe3edcc7..6399687273 100644
--- a/panda/CMakeLists.txt
+++ b/panda/CMakeLists.txt
@@ -34,6 +34,9 @@ add_subdirectory(src/cull)
 add_subdirectory(src/display)
 add_subdirectory(src/chan)
 add_subdirectory(src/char)
+add_subdirectory(src/dgraph)
+add_subdirectory(src/device)
 
+#add_subdirectory(src/tform)
 #add_subdirectory(src/framework)
 #add_subdirectory(src/testbed)
diff --git a/panda/src/device/CMakeLists.txt b/panda/src/device/CMakeLists.txt
new file mode 100644
index 0000000000..b33fff0d40
--- /dev/null
+++ b/panda/src/device/CMakeLists.txt
@@ -0,0 +1,32 @@
+set(P3DEVICE_HEADERS
+  analogNode.I analogNode.h
+  buttonNode.I buttonNode.h 
+  clientAnalogDevice.I clientAnalogDevice.h clientBase.I 
+  clientBase.h clientButtonDevice.I clientButtonDevice.h 
+  clientDevice.I clientDevice.h clientDialDevice.I 
+  clientDialDevice.h clientTrackerDevice.I 
+  clientTrackerDevice.h config_device.h
+  dialNode.I dialNode.h 
+  mouseAndKeyboard.h
+  trackerData.I trackerData.h
+  trackerNode.I trackerNode.h
+  virtualMouse.h
+)
+set(P3DEVICE_SOURCES
+  analogNode.cxx
+  buttonNode.cxx
+  clientAnalogDevice.cxx 
+  clientBase.cxx clientButtonDevice.cxx clientDevice.cxx 
+  clientDialDevice.cxx clientTrackerDevice.cxx 
+  config_device.cxx
+  dialNode.cxx
+  mouseAndKeyboard.cxx
+  trackerData.cxx
+  trackerNode.cxx
+  virtualMouse.cxx
+)
+
+composite_sources(p3device P3DEVICE_SOURCES)
+add_library(p3device ${P3DEVICE_SOURCES} ${P3DEVICE_HEADERS})
+target_link_libraries(p3device p3dgraph p3display)
+target_interrogate(p3device ALL)