diff --git a/CMakeLists.txt b/CMakeLists.txt
index f82b92fae22f30641a4cc6d9f63eead54c0de82e..df0b186f8debf8eb3e860eab3cda4d55047128f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -106,7 +106,10 @@ ADD_SUBDIRECTORY(unitTesting)
 #
 # Documentation produced by doxygen
 #
-INCLUDE(FindDoxygen)
-IF(DOXYGEN_FOUND)
-  add_subdirectory(doc)
-ENDIF(DOXYGEN_FOUND)
+IF(GENERATE_DOC)
+  INCLUDE(FindDoxygen)
+  IF(DOXYGEN_FOUND)
+    MESSAGE(STATUS "Doxygen found")
+    add_subdirectory(doc)
+  ENDIF(DOXYGEN_FOUND)
+ENDIF(GENERATE_DOC)