Merge branch '1.1'

KDAB · Apr 2, 2024 · 59c25cc · 59c25cc
2 parents af224e5 + 65500c4
commit 59c25cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/cmake/ECM/modules/ECMGenerateHeaders.cmake b/cmake/ECM/modules/ECMGenerateHeaders.cmake
@@ -176,7 +176,8 @@ function(ECM_GENERATE_HEADERS camelcase_forwarding_headers_var)
         endif()
 
         set(_actualheader "${CMAKE_CURRENT_SOURCE_DIR}/${EGH_RELATIVE}${originalbasename}.${EGH_HEADER_EXTENSION}")
-        if (NOT EXISTS ${_actualheader})
+        get_source_file_property(_generated "${_actualheader}" GENERATED)
+        if (NOT _generated AND NOT EXISTS ${_actualheader})
             message(FATAL_ERROR "Could not find \"${_actualheader}\"")
         endif()
 

diff --git a/docs/api/CMakeLists.txt b/docs/api/CMakeLists.txt
@@ -52,7 +52,7 @@ add_custom_command(
             ${DOXYGEN_OUTPUT_DIR}/html/LICENSES
     COMMAND ${CMAKE_COMMAND} -E make_directory ${DOXYGEN_OUTPUT_DIR}/html/docs
     COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/examples ${DOXYGEN_OUTPUT_DIR}/html/examples
-    DEPENDS ${_dox_deps} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
+    DEPENDS ${_dox_deps} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile ${CMAKE_SOURCE_DIR}/README.md
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
     COMMENT "Generate the .qch file"
 )