backport patch to remove tinyxml2 replaced by pugixml https://github.com/musescore/MuseScore/pull/30086.patch --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,7 +123,6 @@ option(MUE_COMPILE_USE_SYSTEM_FREETYPE "Try use system freetype" OFF) option(MUE_COMPILE_USE_SYSTEM_HARFBUZZ "Try use system harfbuzz" OFF) option(MUE_COMPILE_USE_SYSTEM_OPUS "Try use system opus" OFF) option(MUE_COMPILE_USE_SYSTEM_OPUSENC "Try use system libopusenc" OFF) -option(MUE_COMPILE_USE_SYSTEM_TINYXML "Try use system tinyxml" OFF) # === Debug === option(MUE_ENABLE_LOAD_QML_FROM_SOURCE "Load qml files from source (not resource)" OFF) --- a/src/framework/global/CMakeLists.txt +++ b/src/framework/global/CMakeLists.txt @@ -27,7 +27,6 @@ include(${CMAKE_CURRENT_LIST_DIR}/thirdparty/kors_profiler/profiler/profiler.cma include(${CMAKE_CURRENT_LIST_DIR}/thirdparty/kors_modularity/modularity/modularity.cmake) include(${CMAKE_CURRENT_LIST_DIR}/thirdparty/utfcpp/utfcpp.cmake) -find_package(TinyXml REQUIRED) set(MODULE_SRC ${MODULARITY_SRC} ${ASYNC_SRC} @@ -134,7 +133,6 @@ set(MODULE_SRC ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h - ${TINYXML_MODULE_SRC} ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp @@ -265,9 +263,6 @@ list(APPEND MODULE_INCLUDE_PRIVATE list(APPEND MODULE_INCLUDE_PRIVATE ${Z_INCLUDE}) list(APPEND MODULE_LINK ${Z_LIB}) -list(APPEND MODULE_LINK ${TINYXML_MODULE_LINK}) -set(MODULE_DEF ${TINYXML_MODULE_DEF}) - if (QT_SUPPORT) # These are needed by so many modules, that we make them public here, # so that other modules get them transitively.