Explorar el Código

HPCC-9563 XML_CATALOG not being set correctly

Moved XML_CATALOG variable geneartion in xsltproc.cmake.in to config
generation time instead of at run time as it runs in a seperate cmake
thread during the build process.

Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>
Philip Schwartz hace 12 años
padre
commit
91aab2c213
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2 2
      docs/BuildTools/xsltproc.cmake.in

+ 2 - 2
docs/BuildTools/xsltproc.cmake.in

@@ -1,6 +1,6 @@
 #set(ENV{XML_DEBUG_CATALOG} 1) Uncomment to add debugging to xsltproc catalogs.
-SET( ENV{SGML_CATALOG_FILES} ${XML_CATALOG})
-SET( ENV{XML_CATALOG_FILES} ${XML_CATALOG})
+SET( ENV{SGML_CATALOG_FILES} @XML_CATALOG@)
+SET( ENV{XML_CATALOG_FILES} @XML_CATALOG@)
 execute_process(COMMAND "@XSLTPROC_EXECUTABLE@" -nonet @xinclude@ -o @_out_dir@/@_out@ @_xsl@ @_in_dir@/@_file@ RESULT_VARIABLE CMDRESULT)
 if(CMDRESULT)
   message(FATAL_ERROR "xsltproc build failure: ${CMDRESULT}")