diff --git a/CMakeLists.txt b/CMakeLists.txt
index c01d4022..73324432 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,12 @@ PROJECT( octomap-distribution )
 
 ENABLE_TESTING()  # enable CTest environment of subprojects
 
+option(BUILD_OCTOVIS_SUBPROJECT "Build targets from subproject octovis" ON)
+
 ADD_SUBDIRECTORY( octomap )
-ADD_SUBDIRECTORY( octovis )
-ADD_SUBDIRECTORY( dynamicEDT3D )
-	
+if(BUILD_OCTOVIS_SUBPROJECT)
+	ADD_SUBDIRECTORY( octovis )
+	ADD_SUBDIRECTORY( dynamicEDT3D )
+endif()