fix some doxygen issues

ros · Feb 3, 2012 · b1ba803 · b1ba803
1 parent e2f6b41
commit b1ba803
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/cmake/all.cmake b/cmake/all.cmake
@@ -49,7 +49,6 @@ foreach(f
     tools/rt
     tools/threads
     tools/gtest
-    tools/doxygen
     tests
     )
   include(${catkin_EXTRAS_DIR}/${f}.cmake)

diff --git a/cmake/tools/doxygen.cmake b/cmake/tools/doxygen.cmake
@@ -37,6 +37,12 @@ if (DOXYGEN_EXECUTABLE)
   set(DOXYGEN_FOUND TRUE CACHE BOOL "Doxygen found")
 endif()
 
+GET_TARGET_PROPERTY(doxygen_catkin_property doxygen "catkin")
+if (doxygen_catkin_property)
+else()
+  add_custom_target(doxygen COMMENT "doxygen found")
+  set_target_properties(doxygen PROPERTIES "catkin" "found")
+endif()
 
 macro(catkin_doxygen TARGET_NAME SEARCH_DIRS)
   #doxygen based docs
@@ -59,6 +65,7 @@ macro(catkin_doxygen TARGET_NAME SEARCH_DIRS)
     COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
     WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
     )
-  add_dependencies(doc ${TARGET_NAME})
+  add_dependencies(doxygen ${TARGET_NAME})
+
 endmacro()