diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76b57f1364eb5435a5ba43454bd196f25b593cd0..ca7e9600f14134b8e35d6cc272ca595804b90a18 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,6 +131,7 @@ add_subdirectory(DDG4)
 add_subdirectory(DDCond)
 add_subdirectory(DDAlign)
 add_subdirectory(DDEve)
+add_subdirectory(DDCMS)
 add_subdirectory(DDDB)
 
 dd4hep_enable_tests( DDTest )
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index a74d0b46349a989e20a879f57a496443703add32..68a3df1d3cddf1304514497fe254933573b7ad91 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -47,6 +47,7 @@ dd4hep_enable_tests (AlignDet
   CLICSiD
   ClientTests
   Conditions
+  DDCMS
   DDDB
   DDG4
   Persistency