diff options
| -rw-r--r-- | ports/fontconfig/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | ports/fontconfig/CONTROL | 3 | ||||
| -rw-r--r-- | ports/fontconfig/portfile.cmake | 8 |
3 files changed, 6 insertions, 9 deletions
diff --git a/ports/fontconfig/CMakeLists.txt b/ports/fontconfig/CMakeLists.txt index 1692e7856..a556e7059 100644 --- a/ports/fontconfig/CMakeLists.txt +++ b/ports/fontconfig/CMakeLists.txt @@ -74,8 +74,8 @@ if(NOT FC_SKIP_TOOLS) set(FC_CACHEDIR WINDOWSTEMPDIR_FONTCONFIG_CACHE) set(CONFIGDIR ./fonts/conf.d) configure_file(fonts.conf.in ${CMAKE_SOURCE_DIR}/fonts.conf @ONLY) - install(FILES fonts.conf DESTINATION tools/fontconfig/fonts) - install(DIRECTORY conf.d DESTINATION tools/fontconfig/fonts FILES_MATCHING PATTERN "*.conf") + install(FILES fonts.conf DESTINATION tools/fontconfig) + install(DIRECTORY conf.d DESTINATION tools/fontconfig FILES_MATCHING PATTERN "*.conf") endif() install( diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL index d350c7fc4..e1deedec9 100644 --- a/ports/fontconfig/CONTROL +++ b/ports/fontconfig/CONTROL @@ -1,5 +1,6 @@ Source: fontconfig -Version: 2.12.4-10 +Version: 2.12.4 +Port-Version: 11 Homepage: https://www.freedesktop.org/software/fontconfig/front.html 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 db7692779..360c449a6 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -1,6 +1,3 @@ - -include(vcpkg_common_functions) - set(FONTCONFIG_VERSION 2.12.4) vcpkg_download_distfile(ARCHIVE URLS "https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz" @@ -45,7 +42,6 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) endforeach() 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) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_test_cmake(PACKAGE_NAME unofficial-fontconfig) +#vcpkg_test_cmake(PACKAGE_NAME unofficial-fontconfig) |