Commit 88ead937 authored by Shawn Waldon's avatar Shawn Waldon

Make xmlpatterns executable optional

It was optional at configure time, but then the builds failed when it
was not found.
parent 891910cf
Pipeline #6741 passed with stage
......@@ -246,36 +246,37 @@ function (generate_htmls_from_xmls output_files xmls gui_xmls output_dir)
if (NOT EXISTS ${QT_XMLPATTERNS_EXECUTABLE})
message(WARNING "Valid QT_XMLPATTERNS_EXECUTABLE not specified.")
endif()
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${first_xml}.xml"
else()
# process each html file to separate it out into files for each proxy.
COMMAND ${CMAKE_COMMAND}
-Dxmlpatterns:FILEPATH=${QT_XMLPATTERNS_EXECUTABLE}
-Dxml_to_xml_xsl:FILEPATH=${ParaView_CMAKE_DIR}/smxml_to_xml.xsl
-Dgenerate_category_rw_xsl:FILEPATH=${ParaView_CMAKE_DIR}/generate_category_rw.xsl
-Dxml_to_html_xsl:FILEPATH=${ParaView_CMAKE_DIR}/xml_to_html.xsl
-Dxml_to_wiki_xsl:FILEPATH=${ParaView_CMAKE_DIR}/xml_to_wiki.xsl.in
-Dinput_xmls:STRING=${xmls_string}
-Dinput_gui_xmls:STRING=${gui_xmls_string}
-Doutput_dir:PATH=${output_dir}
-Doutput_file:FILEPATH=${CMAKE_CURRENT_BINARY_DIR}/${first_xml}.xml
-P ${ParaView_CMAKE_DIR}/generate_proxydocumentation.cmake
DEPENDS ${xmls}
${ParaView_CMAKE_DIR}/smxml_to_xml.xsl
${ParaView_CMAKE_DIR}/xml_to_html.xsl
${ParaView_CMAKE_DIR}/generate_proxydocumentation.cmake
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
COMMENT "Generating Documentation HTMLs from xmls")
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${first_xml}.xml"
# process each html file to separate it out into files for each proxy.
COMMAND ${CMAKE_COMMAND}
-Dxmlpatterns:FILEPATH=${QT_XMLPATTERNS_EXECUTABLE}
-Dxml_to_xml_xsl:FILEPATH=${ParaView_CMAKE_DIR}/smxml_to_xml.xsl
-Dgenerate_category_rw_xsl:FILEPATH=${ParaView_CMAKE_DIR}/generate_category_rw.xsl
-Dxml_to_html_xsl:FILEPATH=${ParaView_CMAKE_DIR}/xml_to_html.xsl
-Dxml_to_wiki_xsl:FILEPATH=${ParaView_CMAKE_DIR}/xml_to_wiki.xsl.in
-Dinput_xmls:STRING=${xmls_string}
-Dinput_gui_xmls:STRING=${gui_xmls_string}
-Doutput_dir:PATH=${output_dir}
-Doutput_file:FILEPATH=${CMAKE_CURRENT_BINARY_DIR}/${first_xml}.xml
-P ${ParaView_CMAKE_DIR}/generate_proxydocumentation.cmake
DEPENDS ${xmls}
${ParaView_CMAKE_DIR}/smxml_to_xml.xsl
${ParaView_CMAKE_DIR}/xml_to_html.xsl
${ParaView_CMAKE_DIR}/generate_proxydocumentation.cmake
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
COMMENT "Generating Documentation HTMLs from xmls")
set (dependencies ${dependencies}
"${CMAKE_CURRENT_BINARY_DIR}/${first_xml}.xml")
set (${output_files} ${dependencies} PARENT_SCOPE)
"${CMAKE_CURRENT_BINARY_DIR}/${first_xml}.xml")
set (${output_files} ${dependencies} PARENT_SCOPE)
endif()
endfunction()
#------------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment