diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-28 15:08:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-28 15:08:38 -0700 |
| commit | 8e05c0848d0e56308ff16cbd17286849d71fd29a (patch) | |
| tree | 0847c9ef11df38829a290bc5248d2f6e91e783b4 | |
| parent | a2028c85f7f93cc1e8f3f0da2266da0b5942a220 (diff) | |
| parent | 821039eeb702b0f65156fb5510d53b0b9210c506 (diff) | |
| download | vcpkg-8e05c0848d0e56308ff16cbd17286849d71fd29a.tar.gz vcpkg-8e05c0848d0e56308ff16cbd17286849d71fd29a.zip | |
Merge pull request #1367 from eco/tinyxml-static
[tinyxml2] Update tinyxml2 to fix static linkage
| -rw-r--r-- | ports/tinyxml2/CONTROL | 4 | ||||
| -rw-r--r-- | ports/tinyxml2/portfile.cmake | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/ports/tinyxml2/CONTROL b/ports/tinyxml2/CONTROL index ee5e20f34..aaa9a7c4f 100644 --- a/ports/tinyxml2/CONTROL +++ b/ports/tinyxml2/CONTROL @@ -1,3 +1,3 @@ Source: tinyxml2 -Version: 5.0.0 -Description: A simple, small, efficient, C++ XML parser
\ No newline at end of file +Version: 5.0.1 +Description: A simple, small, efficient, C++ XML parser diff --git a/ports/tinyxml2/portfile.cmake b/ports/tinyxml2/portfile.cmake index 59184178d..0c8b0b84b 100644 --- a/ports/tinyxml2/portfile.cmake +++ b/ports/tinyxml2/portfile.cmake @@ -3,13 +3,21 @@ include(vcpkg_common_functions) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO leethomason/tinyxml2 - REF 5.0.0 - SHA512 ef310a466d0aec9dd0d25063c68f5312cd063366ee57499d8e462e25a556ea510617b66cdec1a368e8867dc082e0297e27fe09f16eb915392235be34206881e4 + REF 5.0.1 + SHA512 a51ec5843774df0482620c549fb6c61d30a6db5025be26ff6d25b3c53533a27a57f00b026bd9fbca78e9e30084b3f5f6fbff9dba315d078419da084b57f518ba HEAD_REF master ) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) + set(BUILD_STATIC_LIBS 1) +else() + set(BUILD_STATIC_LIBS 0) +endif() + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + OPTIONS + -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} ) vcpkg_install_cmake() |