mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-09-21 13:41:20 +02:00
2eb435be2c
needed to build with new c++ standards, fix fontconfig linking supercedes fix-linking.patch, (adds a removal of c++11 force)
24 lines
756 B
Diff
24 lines
756 B
Diff
Patch-Source: https://github.com/archlinux/svntogit-packages/blob/bccf43ed23b3e0e7943c973f20faa1f2dc84d99c/trunk/2ac46db5.patch
|
|
From 2ac46db52c6ad401f67ae5b5fcd859a5872f0311 Mon Sep 17 00:00:00 2001
|
|
From: Pierre Ducroquet <pinaraf@pinaraf.info>
|
|
Date: Sat, 1 May 2021 15:08:57 +0200
|
|
Subject: [PATCH] Small CMake modernization
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index fe6502493ed..b237f68fcb6 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -105,11 +90,7 @@ endif()
|
|
message(STATUS "Release build: ${RELEASE_BUILD}")
|
|
|
|
# use CPP-11
|
|
-if (CMAKE_VERSION VERSION_LESS "3.1")
|
|
- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
|
|
-else ()
|
|
- set (CMAKE_CXX_STANDARD 11)
|
|
-endif ()
|
|
+set (CMAKE_CXX_STANDARD 11)
|
|
|
|
############
|
|
#############
|