From aff5e0bf9b26743c8e88aefa1af417048c75b957 Mon Sep 17 00:00:00 2001
From: Chris B <cbieneman@microsoft.com>
Date: Tue, 9 Nov 2021 12:36:00 -0600
Subject: [PATCH] Minor fix for dependencies of generated sources (#4065)

* Minor fix for dependencies of generated sources

For the `CODE_TAG` sources we need to ensure that they are dependencies
of the generation command. This also requires creating an extra
temporary file so that the dependencies aren't circular.

* Fix typo
---
 cmake/modules/HCT.cmake | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/cmake/modules/HCT.cmake b/cmake/modules/HCT.cmake
index d861609d8..927f06168 100644
--- a/cmake/modules/HCT.cmake
+++ b/cmake/modules/HCT.cmake
@@ -44,6 +44,10 @@ function(add_hlsl_hctgen mode)
   set(hctdb ${LLVM_SOURCE_DIR}/utils/hct/hctdb.py)
   set(hctdb_helper ${LLVM_SOURCE_DIR}/utils/hct/hctdb_instrhelp.py)
   set(output ${full_output})
+  set(hct_dependencies ${LLVM_SOURCE_DIR}/utils/hct/gen_intrin_main.txt
+                       ${hctgen}
+                       ${hctdb}
+                       ${hctdb_helper})
 
   set(copy_sources Off)
   if(ARG_BUILD_DIR OR HLSL_COPY_GENERATED_SOURCES)
@@ -58,6 +62,15 @@ function(add_hlsl_hctgen mode)
         set(force_lf "--force-crlf")
       endif()
     endif()
+
+    list(APPEND hct_dependencies ${full_output})
+    if (HLSL_COPY_GENERATED_SOURCES)
+      # The generation command both depends on and produces the final output if
+      # source copying is enabled for CODE_TAG sources. That means we need to
+      # create an extra temporary to key the copy step on.
+      set(output ${temp_output}.2)
+      set(second_copy COMMAND ${CMAKE_COMMAND} -E copy_if_different ${temp_output} ${temp_output}.2)
+    endif()
   endif()
 
   # If we're not copying the sources, set the output for the target as the temp
@@ -69,10 +82,7 @@ function(add_hlsl_hctgen mode)
   if(WIN32 AND NOT HLSL_AUTOCRLF)
     set(force_lf "--force-lf")
   endif()
-  set(hct_dependencies ${LLVM_SOURCE_DIR}/utils/hct/gen_intrin_main.txt
-                       ${hctgen}
-                       ${hctdb}
-                       ${hctdb_helper})
+
   add_custom_command(OUTPUT ${temp_output}
                      COMMAND ${PYTHON_EXECUTABLE}
                              ${hctgen} ${force_lf}
@@ -81,9 +91,10 @@ function(add_hlsl_hctgen mode)
                      DEPENDS ${hct_dependencies}
                      )
   if(copy_sources)
-    add_custom_command(OUTPUT ${full_output}
+    add_custom_command(OUTPUT ${output}
                       COMMAND ${CMAKE_COMMAND} -E copy_if_different
                               ${temp_output} ${full_output}
+                      ${second_copy}
                       DEPENDS ${temp_output}
                       COMMENT "Updating ${ARG_OUTPUT}..."
                       )