diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2013-10-10 05:02:50 +0000 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2013-10-10 05:02:50 +0000 |
| commit | 6602789a480462235e416253144b3bec29f1c729 (patch) | |
| tree | 866d91a6e6fde1de59572c5427deaea3e66acb22 | |
| parent | aa57e00210ff872b2b6e69fba928489f90410c6e (diff) | |
| download | wireshark-6602789a480462235e416253144b3bec29f1c729.tar.gz | |
Fix using fop from CMake
svn path=/trunk/; revision=52484
| -rw-r--r-- | cmake/modules/FindXSLTPROC.cmake | 4 | ||||
| -rw-r--r-- | docbook/CMakeLists.txt | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake index fbbb200ed4..a8a70dcf2f 100644 --- a/cmake/modules/FindXSLTPROC.cmake +++ b/cmake/modules/FindXSLTPROC.cmake @@ -99,7 +99,7 @@ ENDMACRO(XML2HTML) # custom_layer_pdf.xsl # A4 or letter #) -MACRO(XML2PDF _output _sources _stylesheet _paper) +MACRO(XML2PDF _FOP_EXECUTABLE _output _sources _stylesheet _paper) # FIXME: How do I extract the first element of a variable containing a # list of values? Isn't there a "cleaner" solution? # Oh, and I have no idea why I can't directly use _source instead of @@ -122,7 +122,7 @@ MACRO(XML2PDF _output _sources _stylesheet _paper) # FIXME: The images for tip, warning and note (and maybe more of those) # are not found by fop. I have no idea why "system" images don't work # the way other images work. - COMMAND ${FOP_EXECUTABLE} + COMMAND ${_FOP_EXECUTABLE} ${_output}.fo ${_output} DEPENDS diff --git a/docbook/CMakeLists.txt b/docbook/CMakeLists.txt index 76df09dd4c..f0acb951c3 100644 --- a/docbook/CMakeLists.txt +++ b/docbook/CMakeLists.txt @@ -289,6 +289,7 @@ XML2HTML( # Test the effect of this on letter and a4 printers first (ps and non-ps). XML2PDF( + ${FOP_EXECUTABLE} user-guide-a4.pdf WSUG_SOURCE custom_layer_pdf.xsl @@ -296,6 +297,7 @@ XML2PDF( ) XML2PDF( + ${FOP_EXECUTABLE} user-guide-us.pdf WSUG_SOURCE custom_layer_pdf.xsl @@ -334,6 +336,7 @@ XML2HTML( ) XML2PDF( + ${FOP_EXECUTABLE} developer-guide-a4.pdf WSDG_SOURCE custom_layer_pdf.xsl @@ -341,6 +344,7 @@ XML2PDF( ) XML2PDF( + ${FOP_EXECUTABLE} developer-guide-us.pdf WSDG_SOURCE custom_layer_pdf.xsl |