Ensure the use of C++17 standard for Poppler >= 21.12.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 3c91935132)
r14.0.x
Slávek Banko 2 years ago
parent 16e7c3a170
commit 0917f3f2dd
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -1,6 +1,7 @@
#cmakedefine VERSION "@VERSION@"
// poppler-tqt
#cmakedefine HAVE_POPPLER_2112
#cmakedefine HAVE_POPPLER_2111
#cmakedefine HAVE_POPPLER_2108
#cmakedefine HAVE_POPPLER_086

@ -41,6 +41,7 @@ install( FILES
poppler-qt.h poppler-page-transition.h poppler-link-qt3.h
DESTINATION ${INCLUDE_INSTALL_DIR} )
##### poppler-tqt (shared) ############################
tde_add_library( poppler-tqt SHARED AUTOMOC
@ -50,6 +51,12 @@ tde_add_library( poppler-tqt SHARED AUTOMOC
poppler-page-transition.cpp poppler-page-transition-private.h
poppler-private.cpp poppler-private.h
VERSION 0.0.0
CXX_FEATURES ${POPPLER_CXX_FEATURES}
LINK ${POPPLER_LIBRARIES} ${TQT_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
##### install cmake export file #################
tde_install_export( )

@ -24,7 +24,7 @@ check_cxx_source_compiles("
HAVE_POPPLER_030 )
tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 )
foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 21.12 )
string( REPLACE "." "" _poppler_str "${_poppler_ver}" )
if( NOT DEFINED HAVE_POPPLER_${_poppler_str} )
message( STATUS "Performing Test HAVE_POPPLER_${_poppler_str}" )
@ -37,3 +37,7 @@ foreach( _poppler_ver 0.58 0.64 0.70 0.71 0.72 0.76 0.82 0.83 0.86 21.08 21.11 )
endif( )
endif( )
endforeach( )
if( HAVE_POPPLER_2112 )
set( POPPLER_CXX_FEATURES cxx_std_17 CACHE INTERNAL "C++ standard required by Poppler" )
endif()

Loading…
Cancel
Save