diff options
| author | Phil Christensen <philc@microsoft.com> | 2018-12-05 10:56:25 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2018-12-05 10:56:25 -0800 |
| commit | 3b25ec2d5c79b1597e37358ee74cc4f9facd0cb4 (patch) | |
| tree | a6d01f59c8004b063fbc89f5c247bb852a28ade9 | |
| parent | 8b9b8fc7ccfc1ea291de3fd1c21f7ff99069ca92 (diff) | |
| download | vcpkg-3b25ec2d5c79b1597e37358ee74cc4f9facd0cb4.tar.gz vcpkg-3b25ec2d5c79b1597e37358ee74cc4f9facd0cb4.zip | |
[tinyxml2] patch fastrtps to use tinyxml2 namespace
| -rw-r--r-- | ports/fastrtps/CONTROL | 2 | ||||
| -rw-r--r-- | ports/fastrtps/namespace_tinyxml2.patch | 17 | ||||
| -rw-r--r-- | ports/fastrtps/portfile.cmake | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/ports/fastrtps/CONTROL b/ports/fastrtps/CONTROL index 97748211c..c80f7638c 100644 --- a/ports/fastrtps/CONTROL +++ b/ports/fastrtps/CONTROL @@ -1,4 +1,4 @@ Source: fastrtps -Version: 1.5.0-1 +Version: 1.5.0-2 Description: Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium. Build-Depends: openssl, asio, tinyxml2
\ No newline at end of file diff --git a/ports/fastrtps/namespace_tinyxml2.patch b/ports/fastrtps/namespace_tinyxml2.patch new file mode 100644 index 000000000..3df65996f --- /dev/null +++ b/ports/fastrtps/namespace_tinyxml2.patch @@ -0,0 +1,17 @@ +diff --git a/cmake/modules/FindTinyXML2.cmake b/cmake/modules/FindTinyXML2.cmake
+index 24aa98a..4e2188e 100644
+--- a/cmake/modules/FindTinyXML2.cmake
++++ b/cmake/modules/FindTinyXML2.cmake
+@@ -7,10 +7,10 @@ option(TINYXML2_FROM_SOURCE "Integrate TinyXML2 source code inside Fast RTPS" OF
+ find_package(TinyXML2 CONFIG QUIET)
+ if(TinyXML2_FOUND)
+ message(STATUS "Found TinyXML2: ${TinyXML2_DIR}")
+- if(NOT TINYXML2_LIBRARY AND TARGET tinyxml2)
++ if(NOT TINYXML2_LIBRARY AND TARGET tinyxml2::tinyxml2)
+ # in this case, we're probably using TinyXML2 version 5.0.0 or greater
+ # in which case tinyxml2 is an exported target and we should use that
+- set(TINYXML2_LIBRARY tinyxml2)
++ set(TINYXML2_LIBRARY tinyxml2::tinyxml2)
+ endif()
+ else()
+ if(THIRDPARTY)
diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake index 8111de74d..9aed75f5b 100644 --- a/ports/fastrtps/portfile.cmake +++ b/ports/fastrtps/portfile.cmake @@ -6,7 +6,9 @@ vcpkg_from_github( REF b1779b608c7b5b2dcb101728f4213c58bdde74ee # waiting for next release
SHA512 9ec4a1e41296df1c0bc00926d925e0947602fabb68e9b28311e92739b0e1909a2993b15fc05eb31aeb9842ed50127f8d56571d09e57dd64ac6f37d0fed6cea73
HEAD_REF master
- PATCHES fix-install.patch
+ PATCHES
+ fix-install.patch
+ namespace_tinyxml2.patch
)
vcpkg_configure_cmake(
|