calligra/trunk/62f51070.patch

   1 From 62f510702ef9c34ac50f8d8601a4290ab558464c Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20Usta?= <omerusta@gmail.com>
   3 Date: Sun, 6 Jun 2021 08:41:05 +0000
   4 Subject: [PATCH] Update Cmake and deps, Fix Freetype and FontConfig Linkage
   5
   6 diff --git a/CMakeLists.txt b/CMakeLists.txt
   7 index b237f68fcb6..cdcc02f0236 100644
   8 --- a/CMakeLists.txt
   9 +++ b/CMakeLists.txt
  10 @@ -89,9 +89,6 @@ if(NOT DEFINED RELEASE_BUILD)
  11  endif()
  12  message(STATUS "Release build: ${RELEASE_BUILD}")
  13
  14 -# use CPP-11
  15 -set (CMAKE_CXX_STANDARD 11)
  16 -
  17  ############
  18  #############
  19  ## Options ##
  20 @@ -599,8 +593,8 @@ if(NOT WIN32 AND NOT APPLE)
  21         )
  22  endif()
  23
  24 -if(NOT FONTCONFIG_FOUND OR NOT FREETYPE_FOUND)
  25 -    set(FONTCONFIG_INCLUDE_DIR "")
  26 +if(NOT Fontconfig_FOUND OR NOT FREETYPE_FOUND)
  27 +    set(Fontconfig_INCLUDE_DIRS "")
  28      set(FREETYPE_INCLUDE_DIRS "")
  29  else()
  30      add_definitions( -DSHOULD_BUILD_FONT_CONVERSION )
  31 diff --git a/libs/text/CMakeLists.txt b/libs/text/CMakeLists.txt
  32 index 16d7e066fa2..429afe79704 100644
  33 --- a/libs/text/CMakeLists.txt
  34 +++ b/libs/text/CMakeLists.txt
  35 @@ -152,11 +152,11 @@ if( SHOULD_BUILD_FEATURE_RDF )
  36  endif()
  37
  38  if( FONTCONFIG_FOUND )
  39 -    target_link_libraries(kotext PRIVATE ${FONTCONFIG_LIBRARIES})
  40 +    target_link_libraries(kotext PRIVATE Fontconfig::Fontconfig)
  41  endif()
  42
  43  if( FREETYPE_FOUND )
  44 -    target_link_libraries(kotext PRIVATE ${FREETYPE_LIBRARIES})
  45 +    target_link_libraries(kotext PRIVATE Freetype::Freetype)
  46  endif()
  47
  48
  49 --
  50 GitLab