[graphics/krita/krita/4.4.2] /: Upgrade C++ standard to 14 if Boost >= 1.75

L. E. Segovia null at kde.org
Tue Dec 15 21:32:39 GMT 2020


Git commit 75a9c5ba57c96e2a1c881aefd6eb0f4760b506a3 by L. E. Segovia.
Committed on 15/12/2020 at 21:31.
Pushed by lsegovia into branch 'krita/4.4.2'.

Upgrade C++ standard to 14 if Boost >= 1.75

This only affects compilation if a recent enough Boost is detected.

BUG: 430331

CCMAIL: kimageshop at kde.org
(cherry picked from commit 03ff1bae4348a71987c69bb3746cfa6c15d53862)

M  +4    -0    CMakeLists.txt

https://invent.kde.org/graphics/krita/commit/75a9c5ba57c96e2a1c881aefd6eb0f4760b506a3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b54887ff97..12b1b5950b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -574,6 +574,10 @@ endif()
 add_definitions(-DBOOST_ALL_NO_LIB)
 find_package(Boost 1.55 REQUIRED COMPONENTS system)
 include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+if(${Boost_VERSION} VERSION_GREATER_EQUAL "1.75")
+    message(WARNING "Boost 1.75 or higher detected, upgrading to C++14.")
+    set(CMAKE_CXX_STANDARD 14)
+endif()
 ##
 ## Test for GNU Scientific Library
 ##


More information about the kimageshop mailing list