diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-08-24 14:29:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-24 14:29:37 -0700 |
| commit | 515d7326dc361b36bb521b251110735940ff53c4 (patch) | |
| tree | 074f236f554c9771f94beb24f9649aa16009a2cd | |
| parent | 26c8cb56afe89bf72e50b4490189a58de1d3f7cd (diff) | |
| parent | 9a1618c8a554fb00282c94d657557c1d2b5a5193 (diff) | |
| download | vcpkg-515d7326dc361b36bb521b251110735940ff53c4.tar.gz vcpkg-515d7326dc361b36bb521b251110735940ff53c4.zip | |
Merge pull request #1698 from codicodi/fix-expat
[expat] drop debug suffix
| -rw-r--r-- | ports/expat/CONTROL | 2 | ||||
| -rw-r--r-- | ports/expat/portfile.cmake | 3 |
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}") |