Add a sentinel target for perplex generated output

starseeker · starseeker · commit e4277656ef21 · 2021-08-17T13:00:15.000-04:00
Getting an intermittent failure on Windows where the expscan.h header
apparently isn't present on the file system soon enough for the build to
succeed (a subsequent reinvocation of the build command does succeed.)

Try the standard technique of making another file write depend on the
outputs of the header and src file, then define a target depending on
that sentinel file and make the obj libraries depend on that target.
diff --git a/cmake/FindPERPLEX.cmake b/cmake/FindPERPLEX.cmake
@@ -227,6 +227,14 @@ if(NOT COMMAND PERPLEX_TARGET)
     set(PERPLEX_${Name}_SRC ${${PVAR_PREFIX}_OUT_SRC_FILE})
     set(PERPLEX_${Name}_HDR ${${PVAR_PREFIX}_OUT_HDR_FILE})
     set(PERPLEX_${Name}_INCLUDE_DIR ${${PVAR_PREFIX}_WORKING_DIR})
+
+    add_custom_command(
+      OUTPUT ${${PVAR_PREFIX}_WORKING_DIR}/${Name}.sentinel
+      COMMAND ${CMAKE_COMMAND} -E touch ${${PVAR_PREFIX}_WORKING_DIR}/${Name}.sentinel
+      DEPENDS ${${PVAR_PREFIX}_OUT_SRC_FILE} ${${PVAR_PREFIX}_OUT_HDR_FILE}
+      )
+    add_custom_target(${Name} DEPENDS ${${PVAR_PREFIX}_WORKING_DIR}/${Name}.sentinel)
+
   endmacro(PERPLEX_TARGET)
 endif(NOT COMMAND PERPLEX_TARGET)
 
diff --git a/src/express/CMakeLists.txt b/src/express/CMakeLists.txt
@@ -66,6 +66,9 @@ foreach(_src ${EXPRESS_SOURCES})
   add_library(${_objlib} OBJECT ${_src})
   add_dependencies(${_objlib} objlib_expscan_c)
   add_dependencies(${_objlib} objlib_expparse_c)
+  if(TARGET ExpScanner)
+    add_dependencies(${_objlib} ExpScanner)
+  endif(TARGET ExpScanner)
   if(MSVC)
     set_property(TARGET ${_objlib} APPEND PROPERTY COMPILE_DEFINITIONS "SC_EXPRESS_DLL_EXPORTS")
     set_property(TARGET ${_objlib} APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS "SC_EXPRESS_DLL_IMPORTS")
