[cairo][expat][fontconfig][graphicsmagick][libjpeg-turbo][pixman][tiff] Add unofficial targets and usage information

3 files changed, 35 insertions, 13 deletions

diff --git a/ports/fontconfig/CMakeLists.txt b/ports/fontconfig/CMakeLists.txt
index 5fa5c547a..1c552468e 100644
--- a/ports/fontconfig/CMakeLists.txt
+++ b/ports/fontconfig/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.11)
 project(fontconfig C)
 
 add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DHAVE_CONFIG_H)
@@ -6,8 +6,7 @@ add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DHAVE_CONF
 # find dependencies
 find_package(unofficial-iconv CONFIG REQUIRED)
 find_package(Freetype REQUIRED)
-find_path(EXPAT_INCLUDE_DIR expat.h)
-find_library(EXPAT_LIBRARY expat)
+find_package(EXPAT REQUIRED)
 
 add_library(fontconfig
     src/fcatomic.c
@@ -49,9 +48,10 @@ else()
     target_include_directories(fontconfig PRIVATE ${FC_INCLUDE_DIR}/unix)
 endif()
 
-target_link_libraries(fontconfig PRIVATE unofficial::iconv::libiconv Freetype::Freetype ${EXPAT_LIBRARY})
+target_link_libraries(fontconfig PRIVATE unofficial::iconv::libiconv Freetype::Freetype EXPAT::EXPAT)
 
 install(TARGETS fontconfig
+    EXPORT fontconfig-targets
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib)
@@ -73,3 +73,20 @@ if(NOT FC_SKIP_TOOLS)
     install(FILES fonts.conf DESTINATION tools/fontconfig/fonts)
     install(DIRECTORY conf.d DESTINATION tools/fontconfig/fonts FILES_MATCHING PATTERN "*.conf")
 endif()
+
+install(
+    EXPORT fontconfig-targets
+    NAMESPACE unofficial::fontconfig::
+    FILE unofficial-fontconfig-targets.cmake
+    DESTINATION share/unofficial-fontconfig
+)
+
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-fontconfig-config.cmake "
+include(CMakeFindDependencyMacro)
+find_dependency(unofficial-iconv CONFIG)
+find_dependency(Freetype)
+find_dependency(EXPAT)
+
+include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-fontconfig-targets.cmake)
+")
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-fontconfig-config.cmake DESTINATION share/unofficial-fontconfig)
diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL
index c0cf971da..536661659 100644
--- a/ports/fontconfig/CONTROL
+++ b/ports/fontconfig/CONTROL
@@ -1,4 +1,4 @@
 Source: fontconfig

-Version: 2.12.4-3

+Version: 2.12.4-7

 Description: Library for configuring and customizing font access.

 Build-Depends: freetype, expat, libiconv, dirent

diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake
index d35bbb64a..fff6eb477 100644
--- a/ports/fontconfig/portfile.cmake
+++ b/ports/fontconfig/portfile.cmake
@@ -1,18 +1,18 @@
 

 include(vcpkg_common_functions)

+

 set(FONTCONFIG_VERSION 2.12.4)

-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fontconfig-${FONTCONFIG_VERSION})

 vcpkg_download_distfile(ARCHIVE

     URLS "https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz"

     FILENAME "fontconfig-${FONTCONFIG_VERSION}.tar.gz"

-    SHA512 2be3ee0e8e0e3b62571135a3cae06e456c289dd1ad40ef2a7c780406418ee5efce863a833eca5a8ef55bc737a0ea04ef562bba6fd27e174ae43e42131b52810d)

-

-vcpkg_extract_source_archive(${ARCHIVE})

+    SHA512 2be3ee0e8e0e3b62571135a3cae06e456c289dd1ad40ef2a7c780406418ee5efce863a833eca5a8ef55bc737a0ea04ef562bba6fd27e174ae43e42131b52810d

+)

 

-vcpkg_apply_patches(

-    SOURCE_PATH ${SOURCE_PATH}

-    PATCHES

-        "${CMAKE_CURRENT_LIST_DIR}/fcobjtypehash.patch"

+vcpkg_extract_source_archive_ex(

+    OUT_SOURCE_PATH SOURCE_PATH

+    ARCHIVE ${ARCHIVE}

+    REF ${FONTCONFIG_VERSION}

+    PATCHES fcobjtypehash.patch

 )

 

 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

@@ -28,6 +28,9 @@ vcpkg_configure_cmake(
 )

 

 vcpkg_install_cmake()

+

+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-fontconfig TARGET_PATH share/unofficial-fontconfig)

+

 vcpkg_copy_pdbs()

 

 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)

@@ -40,3 +43,5 @@ endif()
 

 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fontconfig)

 file(RENAME ${CURRENT_PACKAGES_DIR}/share/fontconfig/COPYING ${CURRENT_PACKAGES_DIR}/share/fontconfig/copyright)

+

+vcpkg_test_cmake(PACKAGE_NAME unofficial-fontconfig)