mirror of
https://github.com/microsoft/vcpkg.git
synced 2025-01-14 06:08:03 +08:00
[tinyxml2] patch fastrtps to use tinyxml2 namespace
This commit is contained in:
parent
8b9b8fc7cc
commit
3b25ec2d5c
@ -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
|
17
ports/fastrtps/namespace_tinyxml2.patch
Normal file
17
ports/fastrtps/namespace_tinyxml2.patch
Normal file
@ -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)
|
@ -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(
|
||||
|
Loading…
x
Reference in New Issue
Block a user