aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcodicodi <rob.ceglinski@gmail.com>2017-08-24 21:45:00 +0200
committercodicodi <rob.ceglinski@gmail.com>2017-08-24 21:45:00 +0200
commit9a1618c8a554fb00282c94d657557c1d2b5a5193 (patch)
tree66fe9ba78719fb474a4d4febea4af3cd0960ad9a
parenta3e607c8f1b759fee75ef5dd7b420ef7df48da1a (diff)
downloadvcpkg-9a1618c8a554fb00282c94d657557c1d2b5a5193.tar.gz
vcpkg-9a1618c8a554fb00282c94d657557c1d2b5a5193.zip
[expat] drop debug suffix
-rw-r--r--ports/expat/CONTROL2
-rw-r--r--ports/expat/portfile.cmake3
2 files changed, 4 insertions, 1 deletions
diff --git a/ports/expat/CONTROL b/ports/expat/CONTROL
index cee5c9edc..f833c3cf0 100644
--- a/ports/expat/CONTROL
+++ b/ports/expat/CONTROL
@@ -1,3 +1,3 @@
Source: expat
-Version: 2.2.4
+Version: 2.2.4-1
Description: XML parser library written in C
diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake
index 3a7430db3..da6ddc429 100644
--- a/ports/expat/portfile.cmake
+++ b/ports/expat/portfile.cmake
@@ -29,6 +29,9 @@ file(INSTALL ${SOURCE_PATH}/expat/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/sh
vcpkg_copy_pdbs()
+# CMake's FindExpat currently doesn't look for expatd.lib
+file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/expatd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/expat.lib)
+
file(READ ${CURRENT_PACKAGES_DIR}/include/expat_external.h EXPAT_EXTERNAL_H)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
string(REPLACE "!defined(XML_STATIC)" "/* vcpkg static build !defined(XML_STATIC) */ 0" EXPAT_EXTERNAL_H "${EXPAT_EXTERNAL_H}")