From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
Date: Wed, 2 Mar 2022 10:16:02 +0100
Subject: Use system taocpp-pegtl

---
 CMakeLists.txt                                                   | 1 +
 src/cpp/CMakeLists.txt                                           | 2 +-
 src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParser.cpp | 4 ++--
 src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterGrammar.hpp          | 2 +-
 src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterParseNode.hpp        | 2 +-
 src/cpp/fastdds/xtypes/dynamic_types/idl_parser/IdlGrammar.hpp   | 2 +-
 src/cpp/fastdds/xtypes/dynamic_types/idl_parser/IdlParser.hpp    | 4 ++--
 test/unittest/dds/publisher/CMakeLists.txt                       | 4 ++--
 test/unittest/dds/status/CMakeLists.txt                          | 2 +-
 test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt              | 2 +-
 test/unittest/rtps/discovery/CMakeLists.txt                      | 2 +-
 test/unittest/rtps/network/CMakeLists.txt                        | 2 +-
 test/unittest/rtps/reader/CMakeLists.txt                         | 2 +-
 test/unittest/statistics/rtps/CMakeLists.txt                     | 2 +-
 14 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6939696..c2e1c58 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,6 +271,7 @@ endif()
 
 find_package(nlohmann_json REQUIRED)
 include_directories(thirdparty/filewatch)
+find_package(pegtl REQUIRED)
 
 ###############################################################################
 # Options
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
index a2a5c2f..17796e8 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -492,7 +492,6 @@ target_include_directories(${PROJECT_NAME} PUBLIC
     $<$<BOOL:${TINYXML2_INCLUDE_DIR}>:${TINYXML2_INCLUDE_DIR}>
     $<$<BOOL:${ANDROID}>:${ANDROID_IFADDRS_INCLUDE_DIR}>
     ${THIRDPARTY_BOOST_INCLUDE_DIR}
-    ${PROJECT_SOURCE_DIR}/thirdparty/taocpp-pegtl
     )
 
 # No need to expose linked libs when target is a shared library on MSVC.
@@ -516,6 +515,7 @@ target_link_libraries(${PROJECT_NAME}
     PRIVATE
     eProsima_atomic
     nlohmann_json::nlohmann_json
+    taocpp::pegtl
     )
 
 if (APPLE)
diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParser.cpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParser.cpp
index ffee448..07c8fd8 100644
--- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParser.cpp
+++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterExpressionParser.cpp
@@ -23,8 +23,8 @@
 #include <fastdds/dds/log/Log.hpp>
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
-#include "pegtl.hpp"
-#include "pegtl/contrib/parse_tree.hpp"
+#include <tao/pegtl.hpp>
+#include <tao/pegtl/contrib/parse_tree.hpp>
 
 #include "DDSFilterField.hpp"
 #include "DDSFilterGrammar.hpp"
diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterGrammar.hpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterGrammar.hpp
index d38c50e..dcfce37 100644
--- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterGrammar.hpp
+++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterGrammar.hpp
@@ -19,7 +19,7 @@
 #ifndef _FASTDDS_TOPIC_DDSSQLFILTER_DDSFILTERGRAMMAR_HPP_
 #define _FASTDDS_TOPIC_DDSSQLFILTER_DDSFILTERGRAMMAR_HPP_
 
-#include "pegtl.hpp"
+#include <tao/pegtl.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterParseNode.hpp b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterParseNode.hpp
index da23441..c864672 100644
--- a/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterParseNode.hpp
+++ b/src/cpp/fastdds/topic/DDSSQLFilter/DDSFilterParseNode.hpp
@@ -24,7 +24,7 @@
 
 #include <fastdds/dds/xtypes/type_representation/TypeObject.hpp>
 
-#include "pegtl/contrib/parse_tree.hpp"
+#include <tao/pegtl/contrib/parse_tree.hpp>
 
 #include "DDSFilterField.hpp"
 #include "DDSFilterValue.hpp"
diff --git a/src/cpp/fastdds/xtypes/dynamic_types/idl_parser/IdlGrammar.hpp b/src/cpp/fastdds/xtypes/dynamic_types/idl_parser/IdlGrammar.hpp
index fe22362..54b791c 100644
--- a/src/cpp/fastdds/xtypes/dynamic_types/idl_parser/IdlGrammar.hpp
+++ b/src/cpp/fastdds/xtypes/dynamic_types/idl_parser/IdlGrammar.hpp
@@ -15,7 +15,7 @@
 #ifndef FASTDDS_XTYPES_DYNAMIC_TYPES_IDL_PARSER_IDLGRAMMAR_HPP
 #define FASTDDS_XTYPES_DYNAMIC_TYPES_IDL_PARSER_IDLGRAMMAR_HPP
 
-#include "pegtl.hpp"
+#include <tao/pegtl.hpp>
 
 namespace eprosima {
 namespace fastdds {
diff --git a/src/cpp/fastdds/xtypes/dynamic_types/idl_parser/IdlParser.hpp b/src/cpp/fastdds/xtypes/dynamic_types/idl_parser/IdlParser.hpp
index e3aca60..2b16e5e 100644
--- a/src/cpp/fastdds/xtypes/dynamic_types/idl_parser/IdlParser.hpp
+++ b/src/cpp/fastdds/xtypes/dynamic_types/idl_parser/IdlParser.hpp
@@ -48,8 +48,8 @@
 #include <fastdds/dds/xtypes/dynamic_types/DynamicTypeBuilderFactory.hpp>
 #include <fastdds/dds/xtypes/dynamic_types/Types.hpp>
 
-#include "pegtl.hpp"
-#include "pegtl/analyze.hpp"
+#include <tao/pegtl.hpp>
+#include <tao/pegtl/contrib/analyze.hpp>
 
 #include "IdlGrammar.hpp"
 #include "IdlModule.hpp"
diff --git a/test/unittest/dds/publisher/CMakeLists.txt b/test/unittest/dds/publisher/CMakeLists.txt
index a6ad0ee..63799eb 100644
--- a/test/unittest/dds/publisher/CMakeLists.txt
+++ b/test/unittest/dds/publisher/CMakeLists.txt
@@ -328,11 +328,11 @@ target_include_directories(PublisherTests PRIVATE
     ${Asio_INCLUDE_DIR}
     ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include
     ${PROJECT_SOURCE_DIR}/src/cpp
-    ${PROJECT_SOURCE_DIR}/thirdparty/taocpp-pegtl
     ${PROJECT_SOURCE_DIR}/test/utils
     )
 target_link_libraries(PublisherTests fastdds fastcdr foonathan_memory
     GTest::gmock
+    taocpp::pegtl
     ${CMAKE_DL_LIBS})
 if(QNX)
     target_link_libraries(PublisherTests socket)
@@ -363,7 +363,6 @@ target_include_directories(DataWriterTests PRIVATE
     ${Asio_INCLUDE_DIR}
     ${PROJECT_SOURCE_DIR}/src/cpp
     ${THIRDPARTY_BOOST_INCLUDE_DIR}
-    ${PROJECT_SOURCE_DIR}/thirdparty/taocpp-pegtl
     )
 target_link_libraries(DataWriterTests
     fastcdr
@@ -372,6 +371,7 @@ target_link_libraries(DataWriterTests
     fastdds::xtypes::type-representation
     foonathan_memory
     GTest::gmock
+    taocpp::pegtl
     ${CMAKE_DL_LIBS}
     ${TINYXML2_LIBRARY}
     $<$<BOOL:${SQLITE3_SUPPORT}>:${sqlite3_LIBRARIES}>
diff --git a/test/unittest/dds/status/CMakeLists.txt b/test/unittest/dds/status/CMakeLists.txt
index e32f8b2..3cb7482 100644
--- a/test/unittest/dds/status/CMakeLists.txt
+++ b/test/unittest/dds/status/CMakeLists.txt
@@ -185,7 +185,6 @@ target_include_directories(ListenerTests PRIVATE
     ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include
     ${PROJECT_SOURCE_DIR}/src/cpp
     ${THIRDPARTY_BOOST_INCLUDE_DIR}
-    ${PROJECT_SOURCE_DIR}/thirdparty/taocpp-pegtl
     )
 
 target_link_libraries(ListenerTests
@@ -196,6 +195,7 @@ target_link_libraries(ListenerTests
     foonathan_memory
     ${TINYXML2_LIBRARY}
     GTest::gmock
+    taocpp::pegtl
     ${CMAKE_DL_LIBS}
     ${THIRDPARTY_BOOST_LINK_LIBS}
     )
diff --git a/test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt b/test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt
index d97f2cc..aeb526e 100644
--- a/test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt
+++ b/test/unittest/dds/topic/DDSSQLFilter/CMakeLists.txt
@@ -58,7 +58,6 @@ target_include_directories(DDSSQLFilterTests PRIVATE
     ${PROJECT_SOURCE_DIR}/test/mock/rtps/RTPSDomainImpl/
     ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include
     ${PROJECT_SOURCE_DIR}/src/cpp
-    ${PROJECT_SOURCE_DIR}/thirdparty/taocpp-pegtl
     )
 target_link_libraries(DDSSQLFilterTests
     fastcdr
@@ -66,6 +65,7 @@ target_link_libraries(DDSSQLFilterTests
     fastdds::xtypes::type-representation
     foonathan_memory
     GTest::gmock
+    taocpp::pegtl
     ${CMAKE_DL_LIBS}
     )
 gtest_discover_tests(DDSSQLFilterTests)
diff --git a/test/unittest/rtps/discovery/CMakeLists.txt b/test/unittest/rtps/discovery/CMakeLists.txt
index 0c47194..1007b9e 100644
--- a/test/unittest/rtps/discovery/CMakeLists.txt
+++ b/test/unittest/rtps/discovery/CMakeLists.txt
@@ -73,7 +73,6 @@ target_include_directories(EdpTests PRIVATE
     ${PROJECT_SOURCE_DIR}/test/mock/rtps/WriterProxyData
     ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include
     ${PROJECT_SOURCE_DIR}/src/cpp
-    ${PROJECT_SOURCE_DIR}/thirdparty/taocpp-pegtl
     ${Asio_INCLUDE_DIR}
     )
 target_link_libraries(EdpTests
@@ -82,6 +81,7 @@ target_link_libraries(EdpTests
     fastdds::xtypes::dynamic-types::impl
     foonathan_memory
     GTest::gmock
+    taocpp::pegtl
     ${CMAKE_DL_LIBS})
 if(QNX)
     target_link_libraries(EdpTests socket)
diff --git a/test/unittest/rtps/network/CMakeLists.txt b/test/unittest/rtps/network/CMakeLists.txt
index 26b7e1c..da381d7 100644
--- a/test/unittest/rtps/network/CMakeLists.txt
+++ b/test/unittest/rtps/network/CMakeLists.txt
@@ -149,13 +149,13 @@ target_include_directories(ExternalLocatorsTests PRIVATE
     ${PROJECT_SOURCE_DIR}/test/mock/rtps/WriterProxyData
     ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include
     ${PROJECT_SOURCE_DIR}/src/cpp
-    ${PROJECT_SOURCE_DIR}/thirdparty/taocpp-pegtl
     )
 target_link_libraries(ExternalLocatorsTests
     fastcdr
     fastdds::log
     fastdds::xtypes::dynamic-types::impl
     GTest::gmock
+    taocpp::pegtl
     ${CMAKE_THREAD_LIBS_INIT} ${CMAKE_DL_LIBS})
 
 if(QNX)
diff --git a/test/unittest/rtps/reader/CMakeLists.txt b/test/unittest/rtps/reader/CMakeLists.txt
index eeee9e3..c34f96d 100644
--- a/test/unittest/rtps/reader/CMakeLists.txt
+++ b/test/unittest/rtps/reader/CMakeLists.txt
@@ -417,7 +417,6 @@ target_include_directories(StatefulReaderTests PRIVATE
     ${PROJECT_SOURCE_DIR}/test/mock/dds/DomainParticipantFactory
     ${PROJECT_SOURCE_DIR}/include ${PROJECT_BINARY_DIR}/include
     ${PROJECT_SOURCE_DIR}/src/cpp
-    ${PROJECT_SOURCE_DIR}/thirdparty/taocpp-pegtl
     ${THIRDPARTY_BOOST_INCLUDE_DIR}
     )
 target_link_libraries(StatefulReaderTests
@@ -427,6 +426,7 @@ target_link_libraries(StatefulReaderTests
     fastdds::xtypes::type-representation
     foonathan_memory
     GTest::gmock
+    taocpp::pegtl
     ${CMAKE_DL_LIBS}
     ${TINYXML2_LIBRARY}
     ${sqlite3_LIBRARIES}
diff --git a/test/unittest/statistics/rtps/CMakeLists.txt b/test/unittest/statistics/rtps/CMakeLists.txt
index c10f92d..8e1f66e 100644
--- a/test/unittest/statistics/rtps/CMakeLists.txt
+++ b/test/unittest/statistics/rtps/CMakeLists.txt
@@ -142,7 +142,6 @@ target_include_directories(MonitorServiceTests PRIVATE
     ${PROJECT_SOURCE_DIR}/include
     ${PROJECT_BINARY_DIR}/include
     ${PROJECT_SOURCE_DIR}/src/cpp
-    ${PROJECT_SOURCE_DIR}/thirdparty/taocpp-pegtl
     ${Asio_INCLUDE_DIR}
     )
 
@@ -153,6 +152,7 @@ target_link_libraries(MonitorServiceTests
     fastdds::xtypes::type-representation
     GTest::gtest
     GTest::gmock
+    taocpp::pegtl
     $<$<BOOL:${TLS_FOUND}>:OpenSSL::SSL$<SEMICOLON>OpenSSL::Crypto>
     )