diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt
index beaf8c4196bc963589713c881ea4085dc8f9cf4d..8c60b06add1a931cd21d9da3504bf833519d6193 100644
--- a/Examples/CMakeLists.txt
+++ b/Examples/CMakeLists.txt
@@ -1,15 +1,7 @@
 if(NOT OTB_BUILD_DEFAULT_MODULES)
   message(FATAL_ERROR "BUILD_EXAMPLES requires OTB_BUILD_DEFAULT_MODULES to be ON")
 endif()
-
-# We also need to prevent any OTB_USE_XXX option to be OFF
-# For now we parse module activation list and test if option is ON. If not the cmake configuration stop.
-#TODO We should provide a better mechanism here wich will deactivate only examples required by deactivated options.
-foreach (_activationOption ${OTB_MODULE_ACTIVATION_OPTION_LIST})
-  if(NOT ${_activationOption})
-    message(FATAL_ERROR "BUILD_EXAMPLES requires ${_activationOption} to be ON")
-  endif()
-endforeach()
+# TODO : we also need to prevent any OTB_USE_XXX option to be OFF
 
 find_package(OTB REQUIRED)
 include(${OTB_USE_FILE})