diff --git a/Eigen/src/CMakeLists.txt b/Eigen/src/CMakeLists.txt
index 761c83334..52696a803 100644
--- a/Eigen/src/CMakeLists.txt
+++ b/Eigen/src/CMakeLists.txt
@@ -1,12 +1,6 @@
-ADD_SUBDIRECTORY(Core)
-ADD_SUBDIRECTORY(LU)
-ADD_SUBDIRECTORY(QR)
-ADD_SUBDIRECTORY(SVD)
-ADD_SUBDIRECTORY(Cholesky)
-ADD_SUBDIRECTORY(Geometry)
-ADD_SUBDIRECTORY(Sparse)
-ADD_SUBDIRECTORY(Jacobi)
-ADD_SUBDIRECTORY(Householder)
-ADD_SUBDIRECTORY(Eigenvalues)
-ADD_SUBDIRECTORY(misc)
-ADD_SUBDIRECTORY(plugins)
+file(GLOB Eigen_src_subdirectories "*")
+foreach(f ${Eigen_src_subdirectories})
+  if(NOT f MATCHES ".txt")
+    add_subdirectory(${f})
+  endif()
+endforeach()
diff --git a/Eigen/src/Eigen2Support/CMakeLists.txt b/Eigen/src/Eigen2Support/CMakeLists.txt
new file mode 100644
index 000000000..2d635042e
--- /dev/null
+++ b/Eigen/src/Eigen2Support/CMakeLists.txt
@@ -0,0 +1,6 @@
+FILE(GLOB Eigen_Eigen2Support_SRCS "*.h")
+
+INSTALL(FILES
+  ${Eigen_Eigen2Support_SRCS}
+  DESTINATION ${INCLUDE_INSTALL_DIR}/Eigen/src/Eigen2Support COMPONENT Devel
+  )
diff --git a/Eigen/src/StlSupport/CMakeLists.txt b/Eigen/src/StlSupport/CMakeLists.txt
new file mode 100644
index 000000000..0f094f637
--- /dev/null
+++ b/Eigen/src/StlSupport/CMakeLists.txt
@@ -0,0 +1,6 @@
+FILE(GLOB Eigen_StlSupport_SRCS "*.h")
+
+INSTALL(FILES
+  ${Eigen_StlSupport_SRCS}
+  DESTINATION ${INCLUDE_INSTALL_DIR}/Eigen/src/StlSupport COMPONENT Devel
+  )