From 57fac72653ea0cc5430b148c5e3021f0d04056c0 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 14 Jun 2020 23:19:05 +0900 Subject: Fixed FTBFS due to missing linked libraries. Signed-off-by: Michele Calgaro (cherry picked from commit 86504f1214deb78997059d71bba74c6b3080cd8f) --- ksvg/CMakeLists.txt | 1 + ksvg/ConfigureChecks.cmake | 9 --------- ksvg/impl/CMakeLists.txt | 1 + 3 files changed, 2 insertions(+), 9 deletions(-) (limited to 'ksvg') diff --git a/ksvg/CMakeLists.txt b/ksvg/CMakeLists.txt index ba7ae70a..bf6fdb31 100644 --- a/ksvg/CMakeLists.txt +++ b/ksvg/CMakeLists.txt @@ -39,5 +39,6 @@ tde_add_library( ksvg SHARED ksvgxrgbrender-static text2path-static ksvgart-static LINK tdehtml-shared ${LCMS_LIBRARY} ${ART_LIBRARIES} ${FRIBIDI_LIBRARIES} + ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/ksvg/ConfigureChecks.cmake b/ksvg/ConfigureChecks.cmake index e3c3893a..9c2622c8 100644 --- a/ksvg/ConfigureChecks.cmake +++ b/ksvg/ConfigureChecks.cmake @@ -53,12 +53,3 @@ else( ) tde_message_fatal( "fribidi is required, but was not found on your system" ) endif( ) - -##### check for fontconfig ###################### - -pkg_search_module( FONTCONFIG fontconfig ) -if( NOT FONTCONFIG_FOUND ) - message(FATAL_ERROR "\nfontconfig are required, but not found on your system" ) -endif( NOT FONTCONFIG_FOUND ) -set( HAVE_FONTCONFIG 1 CACHE INTERNAL "" FORCE ) - diff --git a/ksvg/impl/CMakeLists.txt b/ksvg/impl/CMakeLists.txt index 8b44c254..64599da1 100644 --- a/ksvg/impl/CMakeLists.txt +++ b/ksvg/impl/CMakeLists.txt @@ -89,4 +89,5 @@ tde_add_library( ksvgdomimpl STATIC_PIC AUTOMOC SVGFontFaceUriElementImpl.cc SVGDefinitionSrcElementImpl.cc SVGHKernElementImpl.cc SVGVKernElementImpl.cc SVGMetadataElementImpl.cc SVGForeignObjectElementImpl.cc svgpathparser.cc + LINK kjs-shared ) -- cgit v1.2.1