File: 81_bump_to_C%2B%2B14_std.diff

package info (click to toggle)
luminance-hdr 2.6.1.1%2Bdfsg-6
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 34,912 kB
  • sloc: cpp: 43,967; ansic: 4,122; xml: 116; makefile: 20; sh: 7
file content (23 lines) | stat: -rw-r--r-- 1,179 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
Description: Bump to C++ 14
 C++ 11 breaks with boost 1.88.
Author: Andreas Metzler <ametzler@debian.org>
Origin: vendor
Bug-Debian: https://bugs.debian.org/1110597
Bug: https://github.com/LuminanceHDR/LuminanceHDR/issues/291
Last-Update: 2025-08-11

--- a/build_files/Modules/CompilerSettings.cmake
+++ b/build_files/Modules/CompilerSettings.cmake
@@ -13,11 +13,11 @@ ENDIF()
 if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
     add_definitions(-DBRANCH_PREDICTION)
     execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
     if (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
         message(STATUS "C++11 activated for GCC ${GCC_VERSION}")
-        set(CMAKE_CXX_STANDARD 11)
+        set(CMAKE_CXX_STANDARD 14)
         add_definitions(-DLHDR_CXX11_ENABLED)
     elseif(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
         message(WARNING "C++0x activated for GCC ${GCC_VERSION}. If you get any errors update to a compiler that fully supports C++11")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++0x")  # add_definitions("-std=gnu++0x")
         add_definitions(-DLHDR_CXX11_ENABLED)