diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2020-11-11 15:28:09 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-11 15:28:09 -0800 |
| commit | 2c94072bb42f96d43a34d1f02dde2cde6e9e2d61 (patch) | |
| tree | f38bba9e7fe6bda6e44a07b996596df76d648eb0 /ports/libxslt | |
| parent | 3b910eca57c6ecec779b19a13beaa787a5c773df (diff) | |
| download | vcpkg-2c94072bb42f96d43a34d1f02dde2cde6e9e2d61.tar.gz vcpkg-2c94072bb42f96d43a34d1f02dde2cde6e9e2d61.zip | |
[libxslt] Fix install tools and pkgconfig (#14476)
* [libxslt] Fix install tools and pkgconfig
* [libxml2] install pkgconfig
Diffstat (limited to 'ports/libxslt')
| -rw-r--r-- | ports/libxslt/CONTROL | 2 | ||||
| -rw-r--r-- | ports/libxslt/portfile.cmake | 16 |
2 files changed, 5 insertions, 13 deletions
diff --git a/ports/libxslt/CONTROL b/ports/libxslt/CONTROL index 04730c946..1e00a1e65 100644 --- a/ports/libxslt/CONTROL +++ b/ports/libxslt/CONTROL @@ -1,6 +1,6 @@ Source: libxslt Version: 1.1.33-7 -Port-Version: 1 +Port-Version: 2 Homepage: https://github.com/GNOME/libxslt Description: Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT Build-Depends: libxml2, liblzma diff --git a/ports/libxslt/portfile.cmake b/ports/libxslt/portfile.cmake index 86b633ee5..63cb6d322 100644 --- a/ports/libxslt/portfile.cmake +++ b/ports/libxslt/portfile.cmake @@ -21,7 +21,7 @@ if (VCPKG_TARGET_IS_WINDOWS) prefix=@INSTALL_DIR@ include=@INCLUDE_DIR@ lib=@LIB_DIR@ - bindir=$(PREFIX)\\tools + bindir=$(PREFIX)\\bin sodir=$(PREFIX)\\bin ) # Debug params @@ -60,6 +60,8 @@ if (VCPKG_TARGET_IS_WINDOWS) OPTIONS rebuild ) + vcpkg_copy_tools(TOOL_NAMES xsltproc AUTO_CLEAN) + # The makefile builds both static and dynamic libraries, so remove the ones we don't want if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(REMOVE ${CURRENT_PACKAGES_DIR}/lib/libxslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX} ${CURRENT_PACKAGES_DIR}/lib/libexslt_a${VCPKG_TARGET_STATIC_LIBRARY_SUFFIX}) @@ -103,16 +105,8 @@ else() ) vcpkg_install_make() - #vcpkg_fixup_pkgconfig()? + vcpkg_fixup_pkgconfig() - if (EXISTS ${CURRENT_PACKAGES_DIR}/bin/xslt-config) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/xslt-config DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/xslt-config) - endif() - if (EXISTS ${CURRENT_PACKAGES_DIR}/bin/xsltproc) - file(COPY ${CURRENT_PACKAGES_DIR}/bin/xsltproc DESTINATION ${CURRENT_PACKAGES_DIR}/tools) - file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/xslt-config) - endif() if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) file(COPY ${CURRENT_PACKAGES_DIR}/lib/libxslt.so ${CURRENT_PACKAGES_DIR}/bin/) else() @@ -143,8 +137,6 @@ endif() file(WRITE ${CURRENT_PACKAGES_DIR}/include/libexslt/exsltexports.h "${EXSLTEXPORTS_H}") # Remove tools and debug include directories -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/tools) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/tools) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) |