Merge branch 'release-6.14'

dartsim · Jun 26, 2024 · bfe2fb5 · bfe2fb5
2 parents 90414a4 + ed209b2
commit bfe2fb5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -660,18 +660,17 @@ if(DOXYGEN_FOUND)
     COMMAND find "${DOXYGEN_OUTPUT_ROOT}" -type f -name "*.html"
         -exec sed -i 's: doxygen=\"[^\"]*\"::g' {} \\$<SEMICOLON>
     COMMAND ${CMAKE_COMMAND} -E echo "Done."
-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/doxygen
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/docs/doxygen
     DEPENDS ${DOXYGEN_DOXYFILE}
   )
-  # add_custom_target(docs ALL DEPENDS ${DOXYGEN_HTML_INDEX})
   add_custom_target(docs DEPENDS ${DOXYGEN_HTML_INDEX})
   add_custom_target(
     docs_forced
     COMMAND ${CMAKE_COMMAND} -E echo_append "Building API Documentation..."
     COMMAND ${DOXYGEN_EXECUTABLE} -u ${DOXYGEN_DOXYFILE}
     COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYGEN_DOXYFILE}
     COMMAND ${CMAKE_COMMAND} -E echo "Done."
-    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/doxygen
+    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/docs/doxygen
   )
 
   # Add the "view_docs" target that opens the generated API documentation.

diff --git a/scripts/docs_versions.txt b/scripts/docs_versions.txt
@@ -1,5 +1,4 @@
 DART 6
-v6.14.1
 v6.13.2
 v6.12.2
 v6.11.1