r23419 by craig - #15980: CMake cleanup #6, import FindFontconfig from CMake 3.14+ tempoarily until we can set 3.14 as default. Use it

[scribus-commit]

Author: craig
Date: Tue Dec 10 22:41:26 2019
New Revision: 23419

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23419
Log:
#15980: CMake cleanup #6, import FindFontconfig from CMake 3.14+ tempoarily 
until we can set 3.14 as default. Use it

Added:
    trunk/Scribus/cmake/modules/FindFontconfig.cmake
    trunk/Scribus/cmake/modules/old/FONTCONFIGConfig.cmake
      - copied unchanged from r23418, 
trunk/Scribus/cmake/modules/FONTCONFIGConfig.cmake
Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/CMakeLists_Dependencies.cmake
    trunk/Scribus/cmake/modules/FONTCONFIGConfig.cmake

Modified: trunk/Scribus/CMakeLists.txt
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23419&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt        (original)
+++ trunk/Scribus/CMakeLists.txt        Tue Dec 10 22:41:26 2019
@@ -6,6 +6,9 @@
 #Require 3.1.0 for Qt 5.7 C++ 11 easy support
 #Require 3.2.0 for add_custom_target with byproducts
 #Require 3.12 for new Find Python modules
+#TODO: as soon as we require 3.14.0, use the Cmake own modules for
+# - Fontconfig
+
 cmake_minimum_required(VERSION 3.12.0 FATAL_ERROR)
 
 message(STATUS "CMake Version: ${CMAKE_VERSION}")
@@ -404,7 +407,7 @@
        ${CMAKE_BINARY_DIR}/scribus
        ${QT_INCLUDES}
        ${FREETYPE_INCLUDE_DIR}
-       ${FONTCONFIG_INCLUDE_DIR}
+#      ${FONTCONFIG_INCLUDE_DIR}
        ${JPEG_INCLUDE_DIR}
        ${LCMS2_INCLUDE_DIR}
        ${LIBXML2_INCLUDE_DIR}

Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL: 
http://scribus.net/websvn/diff.php?repname=Scribus&rev=23419&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake (original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake Tue Dec 10 22:41:26 2019
@@ -228,15 +228,11 @@
 
 #<<FontConfig
 if(NOT WIN32)
-       set(FONTCONFIG_DIR ${CMAKE_MODULE_PATH})
-       find_package(FONTCONFIG)
-       if(FONTCONFIG_FOUND)
+       find_package(Fontconfig REQUIRED)
+       if(Fontconfig_FOUND)
                message("FontConfig Found OK")
                set(HAVE_FONTCONFIG ON)
        endif()
-else()
-       # Windows builds neither use nor require fontconfig
-       set(FONTCONFIG_INCLUDE_DIR)
 endif()
 #>>FontConfig
 


_______________________________________________
scribus-commit mailing list
scribus-commit@lists.scribus.net
http://lists.scribus.net/mailman/listinfo/scribus-commit