diff options
author | Balint Reczey <balint@balintreczey.hu> | 2013-10-10 08:41:14 +0000 |
---|---|---|
committer | Balint Reczey <balint@balintreczey.hu> | 2013-10-10 08:41:14 +0000 |
commit | 7af36bb2db33a44ddd6ab9f8a352e8c885a947f5 (patch) | |
tree | b148214bda0e46f5bfe625486814d1e11f46f2c7 | |
parent | a77e3754c90e9d6e04b9a61a4bcf830a2efab57b (diff) |
Revert "Fix using fop from CMake"
This reverts commit r52484
svn path=/trunk/; revision=52488
-rw-r--r-- | cmake/modules/FindXSLTPROC.cmake | 4 | ||||
-rw-r--r-- | docbook/CMakeLists.txt | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake index a8a70dcf2f..fbbb200ed4 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 _FOP_EXECUTABLE _output _sources _stylesheet _paper) +MACRO(XML2PDF _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 _FOP_EXECUTABLE _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 f0acb951c3..76df09dd4c 100644 --- a/docbook/CMakeLists.txt +++ b/docbook/CMakeLists.txt @@ -289,7 +289,6 @@ 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 @@ -297,7 +296,6 @@ XML2PDF( ) XML2PDF( - ${FOP_EXECUTABLE} user-guide-us.pdf WSUG_SOURCE custom_layer_pdf.xsl @@ -336,7 +334,6 @@ XML2HTML( ) XML2PDF( - ${FOP_EXECUTABLE} developer-guide-a4.pdf WSDG_SOURCE custom_layer_pdf.xsl @@ -344,7 +341,6 @@ XML2PDF( ) XML2PDF( - ${FOP_EXECUTABLE} developer-guide-us.pdf WSDG_SOURCE custom_layer_pdf.xsl |