diff --git a/gtsam/CMakeLists.txt b/gtsam/CMakeLists.txt
index cd1f2c521..90241faa0 100644
--- a/gtsam/CMakeLists.txt
+++ b/gtsam/CMakeLists.txt
@@ -12,6 +12,7 @@ set (gtsam_subdirs
     sam
     sfm 
     slam
+    smart
 	navigation
 )
 
diff --git a/gtsam/smart/CMakeLists.txt b/gtsam/smart/CMakeLists.txt
new file mode 100644
index 000000000..53c18fe96
--- /dev/null
+++ b/gtsam/smart/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Install headers
+file(GLOB smart_headers "*.h")
+install(FILES ${smart_headers} DESTINATION include/gtsam/smart)
+
+# Build tests
+add_subdirectory(tests)
diff --git a/gtsam/smart/tests/CMakeLists.txt b/gtsam/smart/tests/CMakeLists.txt
new file mode 100644
index 000000000..caa3164fa
--- /dev/null
+++ b/gtsam/smart/tests/CMakeLists.txt
@@ -0,0 +1 @@
+gtsamAddTestsGlob(smart "test*.cpp" "" "gtsam")