Revision: 53841
http://brlcad.svn.sourceforge.net/brlcad/?rev=53841&view=rev
Author: starseeker
Date: 2012-11-27 23:14:04 +0000 (Tue, 27 Nov 2012)
Log Message:
-----------
Grr - ordering issues with script generation in DocBook targets.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/DocBook.cmake
Modified: brlcad/trunk/misc/CMake/DocBook.cmake
===================================================================
--- brlcad/trunk/misc/CMake/DocBook.cmake 2012-11-27 21:53:29 UTC (rev
53840)
+++ brlcad/trunk/misc/CMake/DocBook.cmake 2012-11-27 23:14:04 UTC (rev
53841)
@@ -174,17 +174,22 @@
set(EXTRAS ${EXTRAS} ${bin_root}/${DOC_DIR}/${targetdir}/${extra_out})
endforeach(extra_out ${EXTRA_OUTPUTS})
- # Generate the script that will be used to run the XSLT executable
- DB_SCRIPT("${targetname}" "${DOC_DIR}/${targetdir}" "${XSLT_EXECUTABLE}")
-
if(BRLCAD_EXTRADOCS_VALIDATE)
DB_VALIDATE_TARGET(${targetname} ${targetdir} ${filename_root})
+
+ # Generate the script that will be used to run the XSLT executable
+ DB_SCRIPT("${targetname}" "${DOC_DIR}/${targetdir}"
"${XSLT_EXECUTABLE}")
+
add_custom_command(
OUTPUT ${outfile} ${EXTRAS}
COMMAND ${CMAKE_COMMAND} -P ${scriptfile}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${filename} ${db_outfile}
${XSLTPROC_EXECUTABLE_TARGET} ${DOCBOOK_RESOURCE_FILES} ${XSL_XHTML_STYLESHEET}
${deps_list}
)
else(BRLCAD_EXTRADOCS_VALIDATE)
+
+ # Generate the script that will be used to run the XSLT executable
+ DB_SCRIPT("${targetname}" "${DOC_DIR}/${targetdir}"
"${XSLT_EXECUTABLE}")
+
add_custom_command(
OUTPUT ${outfile} ${EXTRAS}
COMMAND ${CMAKE_COMMAND} -P ${scriptfile}
@@ -228,17 +233,22 @@
set(EXTRAS ${EXTRAS} ${bin_root}/${MAN_DIR}/${targetdir}/${extra_out})
endforeach(extra_out ${EXTRA_OUTPUTS})
- # Generate the script that will be used to run the XSLT executable
- DB_SCRIPT("${targetname}" "${MAN_DIR}/${targetdir}" "${XSLT_EXECUTABLE}")
-
if(BRLCAD_EXTRADOCS_VALIDATE)
DB_VALIDATE_TARGET(${targetname} ${targetdir} ${filename_root})
+
+ # Generate the script that will be used to run the XSLT executable
+ DB_SCRIPT("${targetname}" "${MAN_DIR}/${targetdir}"
"${XSLT_EXECUTABLE}")
+
add_custom_command(
OUTPUT ${outfile} ${EXTRAS}
COMMAND ${CMAKE_COMMAND} -P ${scriptfile}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${filename} ${db_outfile}
${XSLTPROC_EXECUTABLE_TARGET} ${DOCBOOK_RESOURCE_FILES} ${XSL_MAN_STYLESHEET}
${deps_list}
)
else(BRLCAD_EXTRADOCS_VALIDATE)
+
+ # Generate the script that will be used to run the XSLT executable
+ DB_SCRIPT("${targetname}" "${MAN_DIR}/${targetdir}"
"${XSLT_EXECUTABLE}")
+
add_custom_command(
OUTPUT ${outfile} ${EXTRAS}
COMMAND ${CMAKE_COMMAND} -P ${scriptfile}
@@ -283,15 +293,16 @@
endif(CMAKE_CONFIGURATION_TYPES)
set(fo_outfile ${outfile})
set(CURRENT_XSL_STYLESHEET ${XSL_FO_STYLESHEET})
- DB_SCRIPT("${targetname}" "${DOC_DIR}/${targetdir}" "${XSLT_EXECUTABLE}")
if(BRLCAD_EXTRADOCS_VALIDATE)
DB_VALIDATE_TARGET(${targetname} ${targetdir} ${filename_root})
+ DB_SCRIPT("${targetname}" "${DOC_DIR}/${targetdir}"
"${XSLT_EXECUTABLE}")
add_custom_command(
OUTPUT ${outfile}
COMMAND ${CMAKE_COMMAND} -P ${scriptfile}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${filename} ${db_outfile}
${XSLTPROC_EXECUTABLE_TARGET} ${DOCBOOK_RESOURCE_FILES} ${XSL_FO_STYLESHEET}
${deps_list}
)
else(BRLCAD_EXTRADOCS_VALIDATE)
+ DB_SCRIPT("${targetname}" "${DOC_DIR}/${targetdir}"
"${XSLT_EXECUTABLE}")
add_custom_command(
OUTPUT ${outfile}
COMMAND ${CMAKE_COMMAND} -P ${scriptfile}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Keep yourself connected to Go Parallel:
DESIGN Expert tips on starting your parallel project right.
http://goparallel.sourceforge.net
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
