diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 9e45c7a7c993af301e56687b453adc91b4b24128..a54a2dea93382d17ebc64ccadc0c5c3cffcc8674 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -45,6 +45,14 @@ INCLUDE_DIRECTORIES("${Boost_INCLUDE_DIRS}" ${PYTHON_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/src")
 INCLUDE_DIRECTORIES("${CMAKE_CURRENT_BINARY_DIR}")
 
+ADD_CUSTOM_TARGET(generate_doxygen_cpp_doc
+  COMMAND ${CMAKE_SOURCE_DIR}/cmake/doxygen/doxygen_xml_parser.py
+  ${CMAKE_BINARY_DIR}/doc/doxygen-xml/index.xml
+  ${CMAKE_CURRENT_BINARY_DIR}/doxygen_autodoc
+  COMMENT "Generating Doxygen C++ documentation"
+  )
+ADD_DEPENDENCIES(generate_doxygen_cpp_doc doc)
+
 SET(${LIBRARY_NAME}_HEADERS
   fcl.hh
   ) 
@@ -62,6 +70,7 @@ ADD_LIBRARY(${LIBRARY_NAME} SHARED ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_
 ADD_DEPENDENCIES(python ${LIBRARY_NAME})
 ADD_HEADER_GROUP(${LIBRARY_NAME}_HEADER)
 ADD_SOURCE_GROUP(${LIBRARY_NAME}_SOURCES)
+ADD_DEPENDENCIES(${LIBRARY_NAME} generate_doxygen_cpp_doc)
 
 TARGET_LINK_BOOST_PYTHON(${LIBRARY_NAME} PUBLIC)
 TARGET_LINK_LIBRARIES(${LIBRARY_NAME} PUBLIC ${PROJECT_NAME} ${BOOST_system_LIBRARY})