.gitlab-ci.yml | 2 +- CMakeLists.txt | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-)
New commits: commit 4e0546d0d9dfc5b97c3abc58a8b1fe672fcd695c Author: Albert Astals Cid <[email protected]> Date: Sun Jun 7 11:19:02 2020 +0200 CI: build lcms and libcurl on Ubuntu 16.04 diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c5d49d7e..6a7a9c4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -49,7 +49,7 @@ build_ubuntu_16_04: image: ubuntu:xenial 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 + - 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 script: - mkdir -p build && cd build - cmake -G Ninja .. commit e3a48759464806565cfd332a9dac0d0a9e9086ba Author: Albert Astals Cid <[email protected]> Date: Sun Jun 7 11:18:27 2020 +0200 fix running cmake with cmake < 3.12 diff --git a/CMakeLists.txt b/CMakeLists.txt index ae175807..34eeb266 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -454,7 +454,11 @@ if(ENABLE_LIBCURL) poppler/CurlCachedFile.cc poppler/CurlPDFDocBuilder.cc ) - set(poppler_LIBS ${poppler_LIBS} CURL::libcurl) + if(${CMAKE_VERSION} VERSION_LESS "3.12.0") + set(poppler_LIBS ${poppler_LIBS} ${CURL_LIBRARIES}) + else() + set(poppler_LIBS ${poppler_LIBS} CURL::libcurl) + endif() endif() if (ENABLE_NSS3) set(poppler_SRCS ${poppler_SRCS} _______________________________________________ poppler mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/poppler
