diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt
index 9fac3b00b..cd1f2c521 100644
--- a/gtsam/CMakeLists.txt
+++ b/gtsam/CMakeLists.txt
@@ -8,7 +8,9 @@ set (gtsam_subdirs
 	symbolic 
     discrete 
     linear 
-    nonlinear 
+    nonlinear
+    sam
+    sfm 
     slam
 	navigation
 )
diff --git a/gtsam/sam/CMakeLists.txt b/gtsam/sam/CMakeLists.txt
new file mode 100644
index 000000000..bf20b751c
--- /dev/null
+++ b/gtsam/sam/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Install headers
+file(GLOB sam_headers "*.h")
+install(FILES ${sam_headers} DESTINATION include/gtsam/sam)
+
+# Build tests
+add_subdirectory(tests)
diff --git a/gtsam/sam/tests/CMakeLists.txt b/gtsam/sam/tests/CMakeLists.txt
new file mode 100644
index 000000000..127c619ee
--- /dev/null
+++ b/gtsam/sam/tests/CMakeLists.txt
@@ -0,0 +1 @@
+gtsamAddTestsGlob(sam "test*.cpp" "" "gtsam")
diff --git a/gtsam/sfm/CMakeLists.txt b/gtsam/sfm/CMakeLists.txt
new file mode 100644
index 000000000..fde997840
--- /dev/null
+++ b/gtsam/sfm/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Install headers
+file(GLOB sfm_headers "*.h")
+install(FILES ${sfm_headers} DESTINATION include/gtsam/sfm)
+
+# Build tests
+add_subdirectory(tests)
diff --git a/gtsam/sfm/tests/CMakeLists.txt b/gtsam/sfm/tests/CMakeLists.txt
new file mode 100644
index 000000000..22245dffe
--- /dev/null
+++ b/gtsam/sfm/tests/CMakeLists.txt
@@ -0,0 +1 @@
+gtsamAddTestsGlob(sfm "test*.cpp" "" "gtsam")