From 62f510702ef9c34ac50f8d8601a4290ab558464c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= Date: Sun, 6 Jun 2021 08:41:05 +0000 Subject: [PATCH] Update Cmake and deps, Fix Freetype and FontConfig Linkage Cmake to 3.16 KF to 5.76 QT to 5.12 ECM follow KF's version Update CALLIGRA_YEAR to 2021 Fix Fontconfig's FOUND variable Fix Fontconfig's include_dirs variable Use Correct Target to link FontConfig and Freetype --- CMakeLists.txt | 20 +++++++------------- libs/text/CMakeLists.txt | 4 ++-- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b237f68fcb6..cdcc02f0236 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,9 +89,6 @@ if(NOT DEFINED RELEASE_BUILD) endif() message(STATUS "Release build: ${RELEASE_BUILD}") -# use CPP-11 -set (CMAKE_CXX_STANDARD 11) - ############ ############# ## Options ## endif() -- 2.35.1