diff --git a/eo/CMakeLists.txt b/eo/CMakeLists.txt
index 9b0050e27..2f32bdb81 100644
--- a/eo/CMakeLists.txt
+++ b/eo/CMakeLists.txt
@@ -111,8 +111,17 @@ ENDIF (WIN32)
 #ADD_SUBDIRECTORY(app)
 ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(test)
-ADD_SUBDIRECTORY(tutorial)
+
+if(ENABLE_CMAKE_TESTING)
+    add_subdirectory(test)
+endif(ENABLE_CMAKE_TESTING)
+
+if(ENABLE_CMAKE_EXAMPLE)
+    if(${CMAKE_VERBOSE_MAKEFILE})
+        message("EO Examples :")
+    endif(${CMAKE_VERBOSE_MAKEFILE})
+    add_subdirectory(tutorial)
+endif(ENABLE_CMAKE_EXAMPLE)
 
 ######################################################################################
 
diff --git a/eo/tutorial/CMakeLists.txt b/eo/tutorial/CMakeLists.txt
index 6462b5a58..4573f0b4d 100644
--- a/eo/tutorial/CMakeLists.txt
+++ b/eo/tutorial/CMakeLists.txt
@@ -2,15 +2,11 @@
 ### 1) Where must cmake go now ?
 ######################################################################################
 
-IF(ENABLE_EO_TUTORIAL)
-
-  ADD_SUBDIRECTORY(Lesson1)
-  ADD_SUBDIRECTORY(Lesson2)
-  ADD_SUBDIRECTORY(Lesson3)
-  ADD_SUBDIRECTORY(Lesson4)
-  ADD_SUBDIRECTORY(Lesson5)
-  ADD_SUBDIRECTORY(Lesson6)
-
-ENDIF()
+ADD_SUBDIRECTORY(Lesson1)
+ADD_SUBDIRECTORY(Lesson2)
+ADD_SUBDIRECTORY(Lesson3)
+ADD_SUBDIRECTORY(Lesson4)
+ADD_SUBDIRECTORY(Lesson5)
+ADD_SUBDIRECTORY(Lesson6)
 
 ######################################################################################