macOS: use tinyxml1 formula (#4091)

The tinyxml formula is about to be deprecated, so switch to an alternate tinyxml1 formula hosted in the osrf/simulation tap. Signed-off-by: Steve Peters <[email protected]> (cherry picked from commit 7956a5e) # Conflicts: # source/Installation/Alternatives/macOS-Development-Setup.rst
ros2 · Jan 8, 2024 · 7687cac · 7687cac
1 parent 1d9da37
commit 7687cac
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/source/Installation/Alternatives/macOS-Development-Setup.rst b/source/Installation/Alternatives/macOS-Development-Setup.rst
@@ -53,9 +53,15 @@ You need the following things installed to build ROS 2:
 
    .. code-block:: bash
 
+<<<<<<< HEAD
        brew install asio assimp bison bullet cmake console_bridge cppcheck \
          cunit eigen freetype graphviz opencv openssl orocos-kdl pcre poco \
          pyqt5 python qt@5 sip spdlog tinyxml tinyxml2
+=======
+      brew install asio assimp bison bullet cmake console_bridge cppcheck \
+        cunit eigen freetype graphviz opencv openssl orocos-kdl pcre poco \
+        pyqt5 python qt@5 sip spdlog osrf/simulation/tinyxml1 tinyxml2
+>>>>>>> 7956a5e4 (macOS: use tinyxml1 formula (#4091))
 
 #.
    Setup some environment variables: