Revert "Fix using fop from CMake"

This reverts commit r52484

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@52488 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/cmake/modules/FindXSLTPROC.cmake b/cmake/modules/FindXSLTPROC.cmake
index a8a70dcf2f71f1fbc93a77fa2152267edc095f02..fbbb200ed4ea0cf768c3dcfaddf54053942e25cd 100644 (file)
--- 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 f0acb951c336690dc7b915c058acd6c849ca10e1..76df09dd4c75fd9470c64f89bbcaf1b45ec592e3 100644 (file)
--- 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