aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlbert Bezzina <ab@acunetix.com>2017-10-19 15:52:59 +0200
committerAlbert Bezzina <ab@acunetix.com>2017-10-19 15:52:59 +0200
commit039e795567edd2fc6a2c8597f150e68d71920f5b (patch)
tree616232942a84fa8eaa4ead46119de8c0a6b95fec
parent0b75d75f55e8620f1c3f92b5339eed0dd84c4349 (diff)
downloadvcpkg-039e795567edd2fc6a2c8597f150e68d71920f5b.tar.gz
vcpkg-039e795567edd2fc6a2c8597f150e68d71920f5b.zip
FIX: Project did not build successfully when building as static.
-rw-r--r--ports/pugixml/CONTROL2
-rw-r--r--ports/pugixml/portfile.cmake27
2 files changed, 17 insertions, 12 deletions
diff --git a/ports/pugixml/CONTROL b/ports/pugixml/CONTROL
index 5fc5f1e4e..01679ea6e 100644
--- a/ports/pugixml/CONTROL
+++ b/ports/pugixml/CONTROL
@@ -1,3 +1,3 @@
Source: pugixml
-Version: 1.8.1-1
+Version: 1.8.1-2
Description: C++ XML processing library
diff --git a/ports/pugixml/portfile.cmake b/ports/pugixml/portfile.cmake
index 4fcbec84b..0d5123974 100644
--- a/ports/pugixml/portfile.cmake
+++ b/ports/pugixml/portfile.cmake
@@ -7,17 +7,22 @@ vcpkg_download_distfile(ARCHIVE
)
vcpkg_extract_source_archive(${ARCHIVE})
-vcpkg_apply_patches(
- SOURCE_PATH ${SOURCE_PATH}
- PATCHES
- ${CMAKE_CURRENT_LIST_DIR}/pugixmlapi.patch
-)
-
-vcpkg_configure_cmake(
- SOURCE_PATH ${SOURCE_PATH}
- OPTIONS
- -DBUILD_DEFINES="PUGIXML_API=__declspec\(dllexport\)"
-)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+ vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ )
+else()
+ vcpkg_apply_patches(
+ SOURCE_PATH ${SOURCE_PATH}
+ PATCHES
+ ${CMAKE_CURRENT_LIST_DIR}/pugixmlapi.patch
+ )
+ vcpkg_configure_cmake(
+ SOURCE_PATH ${SOURCE_PATH}
+ OPTIONS
+ -DBUILD_DEFINES="PUGIXML_API=__declspec\(dllexport\)"
+ )
+endif()
vcpkg_install_cmake()
vcpkg_copy_pdbs()