From 153ce3e5d234976bba15f12b8bbf68d488763920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 13 May 2024 02:26:38 +0200 Subject: Ensure the use of C++20 standard for Poppler >= 24.04. This resolves issue #96. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 6363c102883cd478d12b410a12ad5eab6e584228) --- tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake index 99a48c8e..41cef754 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake +++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake @@ -14,6 +14,8 @@ set( POPPLER_VERSION_PATCH ${CMAKE_MATCH_3} ) math( EXPR POPPLER_VERSION_C "(${POPPLER_VERSION_MAJOR}*1000000) + (${POPPLER_VERSION_MINOR}*1000) + ${POPPLER_VERSION_PATCH}" ) set( POPPLER_VERSION_C ${POPPLER_VERSION_C} CACHE INTERNAL "Poppler library version as code number" ) -if( NOT POPPLER_VERSION_C LESS 21012000 ) +if( NOT POPPLER_VERSION_C LESS 24004000 ) + set( POPPLER_CXX_FEATURES cxx_std_20 CACHE INTERNAL "C++ standard required by Poppler" ) +elseif( NOT POPPLER_VERSION_C LESS 21012000 ) set( POPPLER_CXX_FEATURES cxx_std_17 CACHE INTERNAL "C++ standard required by Poppler" ) endif() -- cgit v1.2.3