Merge topic 'fix-12323-more-paths-in-finddcmtk'

0167cea Add more find_path locations for DCMTK header files (#12323)

Modules/FindDCMTK.cmake

@@ -108,8 +108,10 @@ foreach(dir
     PATHS
     ${DCMTK_DIR}/${dir}/include
     ${DCMTK_DIR}/${dir}
-    ${DCMTK_DIR}/include/${dir})
-
+    ${DCMTK_DIR}/include/${dir}
+    ${DCMTK_DIR}/include/dcmtk/${dir}
+    ${DCMTK_DIR}/${dir}/include/dcmtk/${dir}
+    )
   mark_as_advanced(DCMTK_${dir}_INCLUDE_DIR)
 
   if(DCMTK_${dir}_INCLUDE_DIR)