diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-05-17 17:26:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-17 17:26:55 -0700 |
| commit | c5daa93506b616d253e257488ecc385271238e2a (patch) | |
| tree | a47189eb69dcb7c0ea4d723b3091854b74bbc7f5 | |
| parent | e215291013e4df572740d1ba3569417ca8f553d6 (diff) | |
| parent | ed0ed7931461a9b76f869c9a152c042897ecaf77 (diff) | |
| download | vcpkg-c5daa93506b616d253e257488ecc385271238e2a.tar.gz vcpkg-c5daa93506b616d253e257488ecc385271238e2a.zip | |
Merge pull request #1114 from eco/xml-static-for-expat
[expat] no dllimport declspec for static builds
| -rw-r--r-- | ports/expat/CONTROL | 4 | ||||
| -rw-r--r-- | ports/expat/portfile.cmake | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ports/expat/CONTROL b/ports/expat/CONTROL index 86d446529..5987991c8 100644 --- a/ports/expat/CONTROL +++ b/ports/expat/CONTROL @@ -1,3 +1,3 @@ Source: expat -Version: 2.1.1 -Description: XML parser library written in C
\ No newline at end of file +Version: 2.1.1-1 +Description: XML parser library written in C diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake index 37180d97b..a347ac2cb 100644 --- a/ports/expat/portfile.cmake +++ b/ports/expat/portfile.cmake @@ -27,4 +27,10 @@ vcpkg_install_cmake() file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/expat RENAME copyright) -vcpkg_copy_pdbs()
\ No newline at end of file +vcpkg_copy_pdbs() + +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}") +endif() +file(WRITE ${CURRENT_PACKAGES_DIR}/include/expat_external.h "${EXPAT_EXTERNAL_H}") |