Wireshark-commits: [Wireshark-commits] master-2.6 4318549: CMake: Search for asciidoctor-pdf separa

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 23 May 2018 13:23:54 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=4318549f095950f5f755c8ac786d23b052667290
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master-2.6
Repository: wireshark

Commits:

4318549 by Gerald Combs (gerald@xxxxxxxxxxxxx):

    CMake: Search for asciidoctor-pdf separate from asciidoctor.
    
    Search for asciidoctorj and asciidoctor-pdf and set
    ASCIIDOCTOR_PDF_EXECUTABLE if either are found. Only enable the PDF
    targets if we find ASCIIDOCTOR_PDF_EXECUTABLE.
    
    Manual backport of geed4961387.
    
    Change-Id: Idd3c19791dfdca950053f60a59751ca04e976b1a
    Reviewed-on: https://code.wireshark.org/review/27729
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
    

Actions performed:

    from  66c0bfa   rnsap: fix use-after-free of "obj_id"
    adds  4318549   CMake: Search for asciidoctor-pdf separate from asciidoctor.


Summary of changes:
 cmake/modules/FindAsciidoctor.cmake | 65 +++++++++++++++++++++++++++----------
 1 file changed, 47 insertions(+), 18 deletions(-)