[poppler] CMakeLists.txt .gitlab-ci.yml

[GitLab Mirror]

 .gitlab-ci.yml |    7 ++++---
 CMakeLists.txt |    9 +++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 26f8a7d1bc9c6cd511989d74fdb54f233b25d663
Author: Hubert Figuière <hub at figuiere.net>
Date:   Tue May 11 19:43:55 2021 -0400

    make boost opt-out if building splash
    
    https://gitlab.freedesktop.org/poppler/poppler/-/issues/1080

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e32eb70..cffdd61b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ before_script:
   - echo 'deb-src http://deb.debian.org/debian unstable main' >> /etc/apt/sources.list
   - apt-get update
   - apt-get build-dep --yes --no-install-recommends poppler
-  - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libgtk-3-dev wget p7zip-full libbrotli-dev
+  - apt-get install --yes --no-install-recommends ninja-build libcurl4-openssl-dev git ca-certificates locales libgtk-3-dev wget p7zip-full libbrotli-dev libboost-container-dev
   - echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen
   - locale-gen
 
@@ -64,7 +64,7 @@ build_ubuntu_18_04:
   image: ubuntu:bionic
   before_script:
     - apt-get update
-    - apt-get install --yes --no-install-recommends build-essential cmake ninja-build libjpeg-dev libopenjp2-7-dev qtbase5-dev gobject-introspection libglib2.0-dev libgtk-3-dev libgirepository1.0-dev libnss3-dev ca-certificates libcurl4-nss-dev liblcms2-dev
+    - apt-get install --yes --no-install-recommends build-essential cmake ninja-build libjpeg-dev libopenjp2-7-dev qtbase5-dev gobject-introspection libglib2.0-dev libgtk-3-dev libgirepository1.0-dev libnss3-dev ca-certificates libcurl4-nss-dev liblcms2-dev libboost-container-dev
   script:
     - mkdir -p build && cd build
     - cmake -G Ninja ..
@@ -76,7 +76,7 @@ build_mingw64_fedora34:
   before_script:
     - dnf install -y 'dnf-command(builddep)'
     - dnf builddep -y mingw64-poppler
-    - dnf -y install glibc-langpack-en make ninja-build
+    - dnf -y install glibc-langpack-en make ninja-build mingw64-boost
   script:
     - mkdir -p build && cd build
     - mingw64-cmake -G Ninja ..
@@ -109,6 +109,7 @@ build_android:
                          -DCMAKE_POSITION_INDEPENDENT_CODE=OFF
                          -DENABLE_DCTDECODER=unmaintained
                          -DENABLE_LIBOPENJPEG=unmaintained
+                         -DENABLE_BOOST=OFF
                          -DCMAKE_TOOLCHAIN_FILE=/opt/nativetooling/share/ECM/toolchain/Android.cmake'
     - ninja && ninja install
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 516a4323..603d908a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,6 +58,7 @@ option(BUILD_QT6_TESTS "Whether to compile the Qt6 test programs." ON)
 option(BUILD_CPP_TESTS "Whether to compile the CPP test programs." ON)
 option(BUILD_MANUAL_TESTS "Whether to compile manual test programs." ON)
 option(ENABLE_SPLASH "Build the Splash graphics backend." ON)
+option(ENABLE_BOOST "Use boost (when Splash is built)." ON)
 option(ENABLE_UTILS "Compile poppler command line utils." ON)
 option(ENABLE_CPP "Compile poppler cpp wrapper." ON)
 option(ENABLE_GLIB "Compile poppler glib wrapper." ON)
@@ -188,6 +189,8 @@ if(ENABLE_SPLASH)
   find_package(Boost 1.58.0)
   if(Boost_FOUND)
     set(USE_BOOST_HEADERS ON)
+  elseif(ENABLE_BOOST)
+    message(FATAL_ERROR "-- Boost recommended for Splash. Use ENABLE_BOOST=OFF to skip.")
   endif()
 endif()
 
@@ -792,6 +795,9 @@ endif()
 message("Building Poppler with support for:")
 show_end_message("font configuration" ${font_configuration})
 show_end_message_yesno("splash output" ENABLE_SPLASH)
+if(ENABLE_SPLASH)
+  show_end_message_yesno("  use boost" ENABLE_BOOST)
+endif()
 show_end_message_yesno("cairo output" CAIRO_FOUND)
 show_end_message_yesno("qt5 wrapper" ENABLE_QT5)
 show_end_message_yesno("qt6 wrapper" ENABLE_QT6)
@@ -808,7 +814,6 @@ show_end_message_yesno("use nss3" ENABLE_NSS3)
 show_end_message_yesno("use curl" ENABLE_LIBCURL)
 show_end_message_yesno("use libopenjpeg2" WITH_OPENJPEG)
 show_end_message_yesno("use lcms2" USE_CMS)
-show_end_message_yesno("use boost" Boost_FOUND)
 show_end_message_yesno("command line utils" ENABLE_UTILS)
 show_end_message_yesno("fuzz target" ENABLE_FUZZER)
 show_end_message("test data dir" ${TESTDATADIR})
@@ -837,7 +842,7 @@ if(NOT HAVE_JPX_DECODER)
   message("Warning: You're not compiling any JPX decoder. Some files will fail to display properly.")
 endif()
 
-if(ENABLE_SPLASH AND NOT Boost_FOUND)
+if(ENABLE_SPLASH AND NOT ENABLE_BOOST)
   message("Warning: Use of boost is recommended for better performance.")
 endif()