diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-04-01 15:19:29 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-04-01 15:19:29 +0200 |
| commit | 3c919351327ed35d2ad13a62d8d5aefccfed36a6 (patch) | |
| tree | 5ce8c8cc6c6562b3644147abfdf4ef8ea8e87082 | |
| parent | 37a6812fbebc918b17506cf6d51e3556c8cdc609 (diff) | |
| download | tdegraphics-3c919351327ed35d2ad13a62d8d5aefccfed36a6.tar.gz tdegraphics-3c919351327ed35d2ad13a62d8d5aefccfed36a6.zip | |
Ensure the use of C++17 standard for Poppler >= 21.12.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rw-r--r-- | config.h.cmake | 1 | ||||
| -rw-r--r-- | tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake | 6 |
3 files changed, 13 insertions, 1 deletions
diff --git a/config.h.cmake b/config.h.cmake index fa71d600..7c1ab17a 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -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 diff --git a/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt b/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt index 28be343b..d95dc846 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt +++ b/tdefile-plugins/dependencies/poppler-tqt/CMakeLists.txt @@ -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( ) diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake index 78f6ffbc..fa82dd3c 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake +++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake @@ -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() |