From 9a1618c8a554fb00282c94d657557c1d2b5a5193 Mon Sep 17 00:00:00 2001 From: codicodi Date: Thu, 24 Aug 2017 21:45:00 +0200 Subject: [PATCH] [expat] drop debug suffix --- ports/expat/CONTROL | 2 +- ports/expat/portfile.cmake | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ports/expat/CONTROL b/ports/expat/CONTROL index cee5c9edc2..f833c3cf07 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 3a7430db34..da6ddc4293 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}")