diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-02-28 14:36:23 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-28 14:36:23 -0800 |
| commit | 773c8267dfb506f41c204f61042f30b6143a8095 (patch) | |
| tree | 5946d1526c3ad77a2df80786a1370d96389d931b /ports/fastrtps/namespace_tinyxml2.patch | |
| parent | 6afbceb27fd2aa39c66f810a22f5d4ad97575110 (diff) | |
| parent | 7859944528be28bee1fda9f325b78d6a7f02124e (diff) | |
| download | vcpkg-773c8267dfb506f41c204f61042f30b6143a8095.tar.gz vcpkg-773c8267dfb506f41c204f61042f30b6143a8095.zip | |
Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/4564
Diffstat (limited to 'ports/fastrtps/namespace_tinyxml2.patch')
| -rw-r--r-- | ports/fastrtps/namespace_tinyxml2.patch | 17 |
1 files changed, 17 insertions, 0 deletions
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)
|