From b7ea495e2e583ba11aa1f156c659f5503cd03465 Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Tue, 28 Apr 2020 09:28:02 -0700 Subject: [PATCH] CMake: Increase our AsciidoctrJ JVM memory limits. One of the builds recently failed with: Generating user-guide.pdf Exception in thread "main" java.lang.OutOfMemoryError: GC overhead limit exceeded Change-Id: I542a39880dffcd3d7bbaec1a180c605b3011c2e2 Reviewed-on: https://code.wireshark.org/review/36966 Reviewed-by: Gerald Combs Petri-Dish: Gerald Combs Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman --- cmake/modules/FindAsciidoctor.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/modules/FindAsciidoctor.cmake b/cmake/modules/FindAsciidoctor.cmake index a4f57af293..7afdbcc0a2 100644 --- a/cmake/modules/FindAsciidoctor.cmake +++ b/cmake/modules/FindAsciidoctor.cmake @@ -20,9 +20,9 @@ FIND_PROGRAM(ASCIIDOCTOR_EXECUTABLE ) if(ASCIIDOCTOR_EXECUTABLE) - # The AsciidctorJ wrapper script sets -Xmx256m. This isn't enough - # for the User's Guide. - set(_asciidoctorj_opts -Xmx800m $ENV{ASCIIDOCTORJ_OPTS}) + # As of 2.2.0 the AsciidctorJ wrapper script sets -Xmn128m -Xms256m -Xmx256m. + # This isn't enough for the User's Guide. + set(_asciidoctorj_opts -Xmn256m -Xms512m -Xmx2048m $ENV{ASCIIDOCTORJ_OPTS}) execute_process( COMMAND ${ASCIIDOCTOR_EXECUTABLE} --version OUTPUT_VARIABLE _ad_full_version ) separate_arguments(_ad_full_version) list(GET _ad_full_version 1 ASCIIDOCTOR_VERSION)