aboutsummaryrefslogtreecommitdiff
path: root/ports/expat
diff options
context:
space:
mode:
authorBob Kast <bob.kast@emc.com>2018-11-13 15:48:26 -0500
committerBob Kast <bob.kast@emc.com>2018-11-13 15:48:26 -0500
commitd9e39bb4056795a70028b228a746da4889ca7c15 (patch)
tree4853304e1e71e45becedfba5d83e3f5321e0b9c9 /ports/expat
parent1a9dadf855ab93ff0803fd1ce4ecceec5bf211f0 (diff)
parentffa114aaa43e8bcdf880d6e2c47ee0ed46125070 (diff)
downloadvcpkg-d9e39bb4056795a70028b228a746da4889ca7c15.tar.gz
vcpkg-d9e39bb4056795a70028b228a746da4889ca7c15.zip
Merge branch 'master' of https://github.com/EMCECS/vcpkg
# Conflicts: # ports/ecsutil/CONTROL # ports/ecsutil/portfile.cmake
Diffstat (limited to 'ports/expat')
-rw-r--r--ports/expat/CONTROL2
-rw-r--r--ports/expat/portfile.cmake6
-rw-r--r--ports/expat/usage4
3 files changed, 9 insertions, 3 deletions
diff --git a/ports/expat/CONTROL b/ports/expat/CONTROL
index edbcf2326..4cdb03f6e 100644
--- a/ports/expat/CONTROL
+++ b/ports/expat/CONTROL
@@ -1,3 +1,3 @@
Source: expat
-Version: 2.2.5
+Version: 2.2.6
Description: XML parser library written in C
diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake
index 485320a8b..7e2c322db 100644
--- a/ports/expat/portfile.cmake
+++ b/ports/expat/portfile.cmake
@@ -6,8 +6,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO libexpat/libexpat
- REF R_2_2_5
- SHA512 61ce2a479521412e0c56c352106c4adfb61a6bedb883921aba3ebccc29311ddd192646ac2c51b41572728d4de6ab4cb60a1dbc71515d742a80a8b59d89ca74d6
+ REF R_2_2_6
+ SHA512 727fbd24041c9af71b32353448583a6d8b38ddf93b10c97510e847939c2ad2be9b40ff6e6e27b725bff277982c2fc96c75f19c4a3ac4a246133eb62870c963d8
HEAD_REF master)
if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -43,3 +43,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
string(REPLACE "!defined(XML_STATIC)" "/* vcpkg static build !defined(XML_STATIC) */ 0" EXPAT_EXTERNAL_H "${EXPAT_EXTERNAL_H}")
endif()
file(WRITE ${CURRENT_PACKAGES_DIR}/include/expat_external.h "${EXPAT_EXTERNAL_H}")
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/expat)
diff --git a/ports/expat/usage b/ports/expat/usage
new file mode 100644
index 000000000..a2d35a66e
--- /dev/null
+++ b/ports/expat/usage
@@ -0,0 +1,4 @@
+The package expat is compatible with built-in CMake targets:
+
+ find_package(EXPAT REQUIRED)
+ target_link_libraries(main PRIVATE EXPAT::EXPAT)