r23422 by craig - Add in extra fontconfig commands

[scribus-commit]

Author: craig
Date: Wed Dec 11 23:08:15 2019
New Revision: 23422

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23422
Log:
Add in extra fontconfig commands

Modified:
    trunk/Scribus/cmake/modules/FindFontconfig.cmake
    trunk/Scribus/scribus/CMakeLists.txt

Modified: trunk/Scribus/cmake/modules/FindFontconfig.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23422&path=/trunk/Scribus/cmake/modules/FindFontconfig.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindFontconfig.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindFontconfig.cmake	Wed Dec 11 23:08:15 2019
@@ -1,7 +1,7 @@
 # Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
 # file Copyright.txt or https://cmake.org/licensing for details.
 
-#Just until cmake 3.14 can be set as required for Scribus
+#Just until cmake 3.14 can be set as required for Scribus,see https://cmake.org/licensing for license details.
 
 #[=======================================================================[.rst:
 FindFontconfig
@@ -15,7 +15,7 @@
 ``Fontconfig::Fontconfig``
   The Fontconfig library, if found.
 
-esult Variables
+Result Variables
 ^^^^^^^^^^^^^^^^
 
 This will define the following variables in your project:

Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23422&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/CMakeLists.txt	Wed Dec 11 23:08:15 2019
@@ -1286,7 +1286,7 @@
 	${FREETYPE_LIBRARIES}
 	${HARFBUZZ_LIBRARIES}
 	${ICU_LIBRARIES}
-	${FONTCONFIG_LIBRARIES}
+#	${FONTCONFIG_LIBRARIES}
 	${LIBXML2_LIBRARIES}
 	${TIFF_LIBRARIES}
 	${JPEG_LIBRARIES}
@@ -1294,6 +1294,14 @@
 	${WIN32_ONLY_LIBS}
 	${GMAGICK_LIBRARIES}
 )
+
+if (TARGET Fontconfig::Fontconfig)
+	target_link_libraries(${EXE_NAME}
+		Fontconfig::Fontconfig
+	)
+endif()
+
+
 
 if (NOT WIN32 AND NOT HAIKU)
 	target_link_libraries(${EXE_NAME}