aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-04-08 18:43:08 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-04-08 18:43:08 -0700
commitcea5cb99b26b3a4bfd42eea8704004632ca7b9f4 (patch)
tree14b6eb80d53c4bb66d469735457ce018a315a216
parenteac027233e38e5973008e17fcd1ea0ec01dedf21 (diff)
downloadvcpkg-cea5cb99b26b3a4bfd42eea8704004632ca7b9f4.tar.gz
vcpkg-cea5cb99b26b3a4bfd42eea8704004632ca7b9f4.zip
[xerces-c] Fixup omission in previous commit -- handle CRT as well.
-rw-r--r--ports/xerces-c/CONTROL2
-rw-r--r--ports/xerces-c/portfile.cmake8
2 files changed, 7 insertions, 3 deletions
diff --git a/ports/xerces-c/CONTROL b/ports/xerces-c/CONTROL
index 7958350c5..e60cb6d01 100644
--- a/ports/xerces-c/CONTROL
+++ b/ports/xerces-c/CONTROL
@@ -1,3 +1,3 @@
Source: xerces-c
-Version: 3.1.4-1
+Version: 3.1.4-2
Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs.
diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake
index 67c917d55..e940fe881 100644
--- a/ports/xerces-c/portfile.cmake
+++ b/ports/xerces-c/portfile.cmake
@@ -8,8 +8,12 @@
include(vcpkg_common_functions)
if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
- message(STATUS "Static linking not supported; building dynamic instead")
- set(VCPKG_LIBRARY_LINKAGE )
+ message(STATUS "Static libraries not supported; building dynamic instead")
+ set(VCPKG_LIBRARY_LINKAGE "dynamic")
+endif()
+if (VCPKG_CRT_LINKAGE STREQUAL "static")
+ message(STATUS "Static linking against the CRT not supported; building dynamic instead")
+ set(VCPKG_CRT_LINKAGE "dynamic")
endif()