diff --git a/Doc/Doxygen/CMakeLists.txt b/Doc/Doxygen/CMakeLists.txt
index 01f7cd6cf3d048e19c902be7c1cdc9fd60f38945..44fa96feb3e16da55664a325650ccf7b3c688520 100644
--- a/Doc/Doxygen/CMakeLists.txt
+++ b/Doc/Doxygen/CMakeLists.txt
@@ -1,4 +1,5 @@
 # configure Doxyfiles; define targets doxy and doxy${flavor}
+find_package(Doxygen REQUIRED)
 set(AUTO_DOX_DIR ${CMAKE_BINARY_DIR}/doxygen)
 file(MAKE_DIRECTORY ${AUTO_DOX_DIR})
 file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/html)
@@ -7,6 +8,6 @@ foreach(flavor user long)
     configure_file(${flavor}/Doxyfile.in
         ${AUTO_DOX_DIR}/Doxyfile.${flavor} @ONLY)
     add_custom_target(doxy${flavor}
-        COMMAND doxygen ${AUTO_DOX_DIR}/Doxyfile.${flavor} )
+        COMMAND Doxygen::doxygen ${AUTO_DOX_DIR}/Doxyfile.${flavor} )
     add_dependencies(doxy doxy${flavor})
 endforeach()
diff --git a/Doc/Doxygen/long/Doxyfile.in b/Doc/Doxygen/long/Doxyfile.in
index 54f04a89f869223698b69a17d05eb7d9fd7405b3..7e65d59c1d53ecda8e850d136128d4c1938b2d61 100644
--- a/Doc/Doxygen/long/Doxyfile.in
+++ b/Doc/Doxygen/long/Doxyfile.in
@@ -2516,7 +2516,7 @@ INTERACTIVE_SVG        = YES
 # found. If left blank, it is assumed the dot tool can be found in the path.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_PATH               =
+DOT_PATH               = @DOXYGEN_DOT_EXECUTABLE@
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the \dotfile
diff --git a/Doc/Doxygen/user/Doxyfile.in b/Doc/Doxygen/user/Doxyfile.in
index 733f6519420c7bc95478fccf68ea44de63b75f7c..bc66caf2ed333a182a5aeb8b044ff9dfee4d2d02 100644
--- a/Doc/Doxygen/user/Doxyfile.in
+++ b/Doc/Doxygen/user/Doxyfile.in
@@ -2516,7 +2516,7 @@ INTERACTIVE_SVG        = YES
 # found. If left blank, it is assumed the dot tool can be found in the path.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_PATH               =
+DOT_PATH               = @DOXYGEN_DOT_EXECUTABLE@
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the \dotfile