Author: craig
Date: Sun Jan 9 12:23:05 2022
New Revision: 24799
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24799
Log:
#16717: When poppler 22.01.0 is found, error out from CMake generation
when C++ standard is less than C++17
Modified:
trunk/Scribus/CMakeLists_Dependencies.cmake
Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24799&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake (original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake Sun Jan 9 12:23:05 2022
@@ -305,6 +305,13 @@
message(STATUS "Found poppler")
message(STATUS "Found poppler libs: ${poppler_LIBRARY}")
message(STATUS "Found poppler includes: ${poppler_INCLUDE_DIR}")
+ if (poppler_VERSION VERSION_GREATER_EQUAL 22.01.0)
+ message(STATUS "Poppler Version:" ${poppler_VERSION})
+ message(STATUS "C++17 is the minimum C++ standard since poppler
22.01.0")
+ if (CMAKE_CXX_STANDARD LESS 17)
+ message(FATAL_ERROR "Please set -DWANT_CPP17=ON on your
CMake command line")
+ endif()
+ endif()
else()
message(FATAL_ERROR "Could not find poppler library")
endif()
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
