summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2024-05-13 02:26:38 +0200
committerSlávek Banko <slavek.banko@axis.cz>2024-05-13 19:33:17 +0200
commit153ce3e5d234976bba15f12b8bbf68d488763920 (patch)
treed4ba5ba414d5470d5a95e4312f3725eb33e9d137
parentfcb418ee7297df4fa96d6337a90f125791d65867 (diff)
downloadtdegraphics-r14.1.x.tar.gz
tdegraphics-r14.1.x.zip
Ensure the use of C++20 standard for Poppler >= 24.04.r14.1.x
This resolves issue #96. Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 6363c102883cd478d12b410a12ad5eab6e584228)
-rw-r--r--tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake4
1 files changed, 3 insertions, 1 deletions
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()