build: allow clients to provide their own pugixml

CMakeLists.txt

@@ -36,8 +36,11 @@ set(PUBLIC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/include")
 
 # pugixml: the XML layer the generated mx::core consumes directly (plan §2.1).
 # Vendored at src/private/pugixml (upstream 1.15, stock pugiconfig).
-add_library(pugixml STATIC ${PRIVATE_DIR}/pugixml/pugixml.cpp)
-target_include_directories(pugixml PUBLIC ${PRIVATE_DIR})
+# Client projects may provide a compatible pugixml target before adding mx.
+if(NOT TARGET pugixml)
+    add_library(pugixml STATIC ${PRIVATE_DIR}/pugixml/pugixml.cpp)
+    target_include_directories(pugixml PUBLIC ${PRIVATE_DIR}/pugixml)
+endif()
 
 # mx_core: the generated C++ typed model plus its hand-written runtime
 # (Decimal, Result, Error, Lexical, Token, NameToken, OneOrMore, Xml). The

Package.swift

@@ -24,8 +24,9 @@ if useBinaryRelease {
     // `src/private`), minus the Catch2 runner, the test suites, and the example
     // programs -- the only files carrying their own main(). The public surface
     // is the mx::api headers under `src/include`; `src/private` is added to the
-    // internal header search path so the model can include `mx/core/...` and
-    // `pugixml/...`.
+    // internal header search path so the model can include `mx/core/...`; and
+    // `src/private/pugixml` is added so sources can use the canonical
+    // `#include "pugixml.hpp"` form that the CMake build also exposes.
     mxTarget = .target(
         name: "Mx",
         path: "src",
@@ -37,6 +38,7 @@ if useBinaryRelease {
         publicHeadersPath: "include",
         cxxSettings: [
             .headerSearchPath("private"),
+            .headerSearchPath("private/pugixml"),
         ]
     )
 }

README.md

@@ -513,7 +513,8 @@ recorded in `docs/ai/design/mx-core-plan.md`.
 
 `mx::core` consumes the vendored [pugixml](http://pugixml.org/) (`src/private/pugixml/`) directly,
 in keeping with the build tenets [above](#build-tenets). The earlier `ezxml` abstraction layer is
-retired.
+retired. A client project may provide a compatible version by creating the CMake `pugixml` target
+before adding `mx`.
 
 ##### `mx::impl`
 

src/private/mx/api/DocumentManager.cpp

@@ -11,7 +11,7 @@
 #include "mx/impl/ScoreWriter.h"
 #include "mx/impl/WriteRefusal.h"
 
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <map>
 #include <mutex>

src/private/mx/core/Attribution.cpp

@@ -13,7 +13,7 @@
 #include "mx/core/generated/ScorePartwise.h"
 #include "mx/core/generated/ScoreTimewise.h"
 
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <utility>
 #include <vector>

src/private/mx/core/Xml.h

@@ -6,7 +6,7 @@
 
 #pragma once
 
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <string>
 #include <string_view>

src/private/mxtest/api/ApiTester.cpp

@@ -2,7 +2,7 @@
 #include "mxtest/api/ApiTester.h"
 #include "mx/api/DocumentManager.h"
 #include "mxtest/file/StupidFileFunctions.h"
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <sstream>
 

src/private/mxtest/api/CorpusRoundtripMain.cpp

@@ -24,7 +24,7 @@
 #include "mx/core/Attribution.h"
 #include "mxtest/corert/Compare.h"
 #include "mxtest/corert/Fixer.h"
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <algorithm>
 #include <filesystem>

src/private/mxtest/api/PitchDataTest.cpp

@@ -7,7 +7,7 @@
 
 #include "cpul/cpulTestHarness.h"
 #include "mx/api/DocumentManager.h"
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <sstream>
 #include <string>

src/private/mxtest/api/SlurTest.cpp

@@ -8,7 +8,7 @@
 #include "cpul/cpulTestHarness.h"
 #include "mxtest/api/TestHelpers.h"
 #include "mxtest/file/MxFileRepository.h"
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <sstream>
 

src/private/mxtest/core/AttributionTest.cpp

@@ -17,7 +17,7 @@
 #include "mx/core/generated/ScoreHeaderGroup.h"
 #include "mx/core/generated/ScorePartwise.h"
 
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <string>
 #include <string_view>

src/private/mxtest/core/DocumentTest.cpp

@@ -15,7 +15,7 @@
 #include "mx/core/generated/Document.h"
 #include "mx/core/generated/Version.h"
 
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <string>
 

src/private/mxtest/core/ShapeTest.cpp

@@ -24,7 +24,7 @@
 #include "mx/core/generated/Pitch.h"
 #include "mx/core/generated/Step.h"
 
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <string>
 

src/private/mxtest/corert/Compare.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <string>
 

src/private/mxtest/corert/CoreRoundtripImpl.cpp

@@ -12,7 +12,7 @@
 #include "mxtest/file/PathRoot.h"
 #include "mxtest/import/Normalize.h"
 
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <algorithm>
 #include <cmath>

src/private/mxtest/corert/Fixer.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <string>
 #include <vector>

src/private/mxtest/import/Normalize.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 namespace mxtest
 {

src/private/mxtest/validate/main.cpp

@@ -13,7 +13,7 @@
 #include "mx/core/generated/Document.h"
 #include "mxtest/corert/CoreRoundtripImpl.h"
 
-#include "pugixml/pugixml.hpp"
+#include "pugixml.hpp"
 
 #include <cstdio>
 #include <filesystem>