Merge pull request #43 from coldtobi/use-system-pugixml-if-available

Use packaged version of pugixml, if it is installed
codereader · Jul 23, 2024 · 9519871 · 9519871
2 parents fa4c266 + e0b7bf8
commit 9519871
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,6 +65,14 @@ pkg_check_modules(ZLIB zlib REQUIRED)
 pkg_check_modules(GLIB glib-2.0 REQUIRED)
 pkg_check_modules(EIGEN eigen3 REQUIRED)
 
+# Locate a packaged pugixml, if installed if not, fall back to embedded code copy.
+find_package(pugixml QUIET)
+if (TARGET pugixml::pugixml)
+    message(NOTICE "Distribution pugixml found and used.")
+else()
+    include_directories(libs/pugixml)
+endif()
+
 # Locate wxWidgets
 find_package(wxWidgets REQUIRED
              COMPONENTS base core stc adv gl xrc aui)

diff --git a/libs/xmlutil/CMakeLists.txt b/libs/xmlutil/CMakeLists.txt
@@ -1 +1,6 @@
 add_library(xmlutil Document.cpp Node.cpp)
+
+# link with system puixml if we have it.
+if (TARGET pugixml::pugixml)
+  target_link_libraries(xmlutil PUBLIC pugixml::pugixml)
+endif()
diff --git a/libs/xmlutil/Document.h b/libs/xmlutil/Document.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "Node.h"
-#include "pugixml/pugixml.hpp"
 
+#include <pugixml.hpp>
 #include <mutex>
 #include <string>
 #include <optional>

diff --git a/libs/xmlutil/Node.h b/libs/xmlutil/Node.h
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "pugixml/pugixml.hpp"
-
+#include <pugixml.hpp>
 #include <string>
 #include <vector>