aboutsummaryrefslogtreecommitdiff
path: root/ports/tinyxml
diff options
context:
space:
mode:
authorThad House <thadhouse1@gmail.com>2019-05-31 13:49:13 -0700
committerThad House <thadhouse1@gmail.com>2019-05-31 13:49:13 -0700
commit788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch)
tree173ade0e6960917458afe9dd9fb0c3c2b7f32051 /ports/tinyxml
parentf483ae4c7fd04eed671a1de595374f84175311e9 (diff)
parent26a9338c5055193915290527eacb37f2ac7fdcb8 (diff)
downloadvcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz
vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip
Merge master
Diffstat (limited to 'ports/tinyxml')
-rw-r--r--ports/tinyxml/CMakeLists.txt4
-rw-r--r--ports/tinyxml/CONTROL6
-rw-r--r--ports/tinyxml/portfile.cmake2
3 files changed, 6 insertions, 6 deletions
diff --git a/ports/tinyxml/CMakeLists.txt b/ports/tinyxml/CMakeLists.txt
index 21776c156..b849c07f9 100644
--- a/ports/tinyxml/CMakeLists.txt
+++ b/ports/tinyxml/CMakeLists.txt
@@ -10,8 +10,6 @@ set(SOURCES "tinyxml.cpp"
option(BUILD_SHARED_LIBS "Build shared libs" OFF)
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
add_library(tinyxml ${SOURCES})
target_compile_definitions(tinyxml PRIVATE "-DTIXML_USE_STL")
@@ -27,5 +25,5 @@ install(
RUNTIME DESTINATION bin
)
-install(FILES ${HEADERS}
+install(FILES ${HEADERS}
${CMAKE_CURRENT_BINARY_DIR}/tinyxml_export.h DESTINATION include)
diff --git a/ports/tinyxml/CONTROL b/ports/tinyxml/CONTROL
index f1075e38e..4eacee3b2 100644
--- a/ports/tinyxml/CONTROL
+++ b/ports/tinyxml/CONTROL
@@ -1,3 +1,3 @@
-Source: tinyxml
-Version: 2.6.2-3
-Description: A simple, small, minimal, C++ XML parser that can be easily integrating into other programs.
+Source: tinyxml
+Version: 2.6.2-4
+Description: A simple, small, minimal, C++ XML parser that can be easily integrating into other programs.
diff --git a/ports/tinyxml/portfile.cmake b/ports/tinyxml/portfile.cmake
index 2936a4d57..b43526efa 100644
--- a/ports/tinyxml/portfile.cmake
+++ b/ports/tinyxml/portfile.cmake
@@ -1,5 +1,7 @@
include(vcpkg_common_functions)
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
vcpkg_download_distfile(ARCHIVE
URLS "https://sourceforge.net/projects/tinyxml/files/tinyxml/2.6.2/tinyxml_2_6_2.tar.gz"
FILENAME "tinyxml_2_6_2.tar.gz"