aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLily <47812810+LilyWangL@users.noreply.github.com>2020-06-12 12:31:24 +0800
committerGitHub <noreply@github.com>2020-06-11 21:31:24 -0700
commit4c86b264fa99a6512f4e16520f23778818c69453 (patch)
tree433010634917d4ecb8f08256f03674295cafa28f
parentdf99d8dcc2286e6a9b167bc7b52a2f44e69f3082 (diff)
downloadvcpkg-4c86b264fa99a6512f4e16520f23778818c69453.tar.gz
vcpkg-4c86b264fa99a6512f4e16520f23778818c69453.zip
[xalan-c] Fix import Xalan.exe (#11869)
* [xalan-c] Fix import Xalan.exe * [xalan-c] Fix import Xalan.exe
-rw-r--r--ports/xalan-c/CONTROL2
-rw-r--r--ports/xalan-c/portfile.cmake12
2 files changed, 4 insertions, 10 deletions
diff --git a/ports/xalan-c/CONTROL b/ports/xalan-c/CONTROL
index dcefa5172..f14ca7a15 100644
--- a/ports/xalan-c/CONTROL
+++ b/ports/xalan-c/CONTROL
@@ -1,5 +1,5 @@
Source: xalan-c
-Version: 1.11-11
+Version: 1.11-12
Homepage: https://github.com/apache/xalan-c
Description: Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types
Build-Depends: xerces-c
diff --git a/ports/xalan-c/portfile.cmake b/ports/xalan-c/portfile.cmake
index 78ae19cf2..6fe1c4bc9 100644
--- a/ports/xalan-c/portfile.cmake
+++ b/ports/xalan-c/portfile.cmake
@@ -1,4 +1,4 @@
-include(vcpkg_common_functions)
+vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
@@ -18,6 +18,7 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
+vcpkg_copy_tools(TOOL_NAMES Xalan AUTO_CLEAN)
if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/xalanc)
@@ -31,14 +32,7 @@ file(REMOVE_RECURSE
${CURRENT_PACKAGES_DIR}/debug/share
)
-if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
- file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-else()
- file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/Xalan.exe ${CURRENT_PACKAGES_DIR}/debug/bin/Xalan.exe)
-endif()
-
# Handle copyright
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/xalan-c)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/xalan-c/LICENSE ${CURRENT_PACKAGES_DIR}/share/xalan-c/copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
vcpkg_copy_pdbs()