Skip to content

Commit f859e13

Browse files
committed
Revert MNX changes until it stabilizes
relevant discussion: #33865 (comment)
1 parent f59320b commit f859e13

4 files changed

Lines changed: 26 additions & 9 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,10 @@ option(MUSE_COMPILE_USE_UNITY "Use unity build" ON)
173173
option(MUSE_COMPILE_USE_COMPILER_CACHE "Try to use compiler cache: tries ccache, sccache, buildcache in that order. Use COMPILER_CACHE_PROGRAM to specify a specific compiler cache program." ON)
174174
option(MUSE_COMPILE_USE_SHARED_LIBS_IN_DEBUG "Build shared libs if possible in debug" OFF)
175175

176+
# === System libraries ===
177+
# Important for the maintainers of Linux distributions
178+
option(MSS_USE_SYSTEM_MNXDOM "Try use system mnxdom" OFF)
179+
176180
# === Debug ===
177181
option(MUE_ENABLE_ENGRAVING_RENDER_DEBUG "Enable rendering debug" OFF)
178182
option(MUE_ENABLE_ENGRAVING_LD_ACCESS "Enable diagnostic engraving check layout data access" OFF)

buildscripts/cmake/DependencyManifest.cmake

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,3 @@ require_dep(opus)
55
require_dep(libsndfile)
66

77
require_source_dep(liblouis)
8-
9-
if (MUE_BUILD_IMPEXP_MNX_MODULE)
10-
require_dep(nlohmann_json)
11-
require_dep(json_schema_validator)
12-
require_source_dep(mnx_w3c)
13-
require_source_dep(mnxdom)
14-
endif()

muse_deps

src/importexport/mnx/CMakeLists.txt

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,26 @@
66

77
muse_create_module(iex_mnx)
88

9+
include(FetchContent)
10+
11+
set(mnxdom_BUILD_TESTING OFF CACHE BOOL "Do not build tests for mnx")
12+
if(MSS_USE_SYSTEM_MNXDOM)
13+
find_package(PkgConfig REQUIRED)
14+
pkg_check_modules(mnxdom REQUIRED IMPORTED_TARGET mnxdom)
15+
set(MNXDOM_LIB PkgConfig::mnxdom)
16+
target_compile_definitions(iex_mnx PRIVATE MNXDOM_SYSTEM)
17+
message(STATUS "Using system-installed mnxdom")
18+
else()
19+
FetchContent_Declare(
20+
mnxdom
21+
GIT_REPOSITORY https://github.com/rpatters1/mnxdom.git
22+
GIT_TAG e7c947bf768caccf315426dcae0dfac02caf738b
23+
)
24+
FetchContent_MakeAvailable(mnxdom)
25+
set(MNXDOM_LIB mnxdom)
26+
message(STATUS "Using fetched mnxdom")
27+
endif()
28+
929
target_sources(iex_mnx PRIVATE
1030
mnxmodule.cpp
1131
mnxmodule.h
@@ -31,7 +51,7 @@ target_sources(iex_mnx PRIVATE
3151
)
3252

3353
target_link_libraries(iex_mnx PRIVATE
34-
mnxdom
54+
${MNXDOM_LIB}
3555
engraving
3656
)
3757

0 commit comments

Comments
 (0)