From 197f5ede6834fb7e431d42ee4bcb0879f72817bc Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Tue, 2 Apr 2024 09:16:14 -0400 Subject: [PATCH 1/2] docs/api/CMakeLists.txt - add a dependency to README.md --- docs/api/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/api/CMakeLists.txt b/docs/api/CMakeLists.txt index 7580a3b..1449035 100644 --- 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" ) From 65500c43e3b3dedcef634546974abbd6430160b6 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Mon, 1 Apr 2024 12:18:07 -0400 Subject: [PATCH 2/2] cmake/ECM - sync to upstream --- cmake/ECM/modules/ECMGenerateHeaders.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/ECM/modules/ECMGenerateHeaders.cmake b/cmake/ECM/modules/ECMGenerateHeaders.cmake index 1ae9cf2..ddd6066 100644 --- 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()