From 2ea224861ea46c7e6df012c8a32efc9178f66c8b Mon Sep 17 00:00:00 2001 From: Johannes Janssen Date: Thu, 3 Apr 2025 23:23:56 +0200 Subject: [PATCH] Changed from meson icu wrap to local installation. --- meson.build | 22 ++-------------------- src/faust-lib/parser/meson.build | 4 ++-- src/programs/compiler/meson.build | 2 +- subprojects/icu.wrap | 16 ---------------- tests/meson.build | 2 +- 5 files changed, 6 insertions(+), 40 deletions(-) delete mode 100644 subprojects/icu.wrap diff --git a/meson.build b/meson.build index 0da46a3..c0fdc5f 100644 --- a/meson.build +++ b/meson.build @@ -12,27 +12,9 @@ gtest_dep = gtest.get_variable('gtest_dep') gmock_dep = gtest.get_variable('gmock_dep') gmock_main_dep = gtest.get_variable('gmock_main_dep') - - # Try to find ICU in the system first -icu_dep = dependency('icu-uc', required: false) -icu_i18_dep = dependency('icu-i18n', required: false) -icu_data_dep = dependency('icu-data', required: false) - -# Fall back to subproject if system ICU is not found -if not icu_dep.found() or not icu_i18_dep.found() or not icu_data_dep.found() - icu = subproject('icu', default_options: ['default_library=static']) - icu_dep = icu.get_variable('icuuc_dep') - icu_i18_dep = icu.get_variable('icui18n_dep') - icu_data_dep = icu.get_variable('icudata_dep') - icu_includes = [icu.get_variable('i18ninc')] -else - icu_includes = [] -endif - -icu_includes = [ - icu.get_variable('i18ninc') -] +icu_dep = dependency('icu-uc', required: true) +icu_i18_dep = dependency('icu-i18n', required: true) subdir('src') subdir('tests') diff --git a/src/faust-lib/parser/meson.build b/src/faust-lib/parser/meson.build index 071cda8..b13d62f 100644 --- a/src/faust-lib/parser/meson.build +++ b/src/faust-lib/parser/meson.build @@ -3,5 +3,5 @@ faust_parser_src = files('parser.cpp', 'lexer.cpp', 'faustLexer.cpp') faust_parser_lib = static_library('faust-parser', sources: [faust_parser_header, faust_parser_src], - dependencies: [icu_dep, icu_i18_dep, icu_data_dep], - include_directories: [faust_src_root_include, icu_includes]) + dependencies: [icu_dep, icu_i18_dep], + include_directories: [faust_src_root_include]) diff --git a/src/programs/compiler/meson.build b/src/programs/compiler/meson.build index 5f5807f..fa95bec 100644 --- a/src/programs/compiler/meson.build +++ b/src/programs/compiler/meson.build @@ -5,5 +5,5 @@ message(faust_parser_lib.path()) executable('faustc', faust_compiler_src, include_directories: faust_src_root_include, - dependencies: [icu_dep, icu_i18_dep, icu_data_dep], + dependencies: [icu_dep, icu_i18_dep], link_with: faust_parser_lib) diff --git a/subprojects/icu.wrap b/subprojects/icu.wrap deleted file mode 100644 index 7132d12..0000000 --- a/subprojects/icu.wrap +++ /dev/null @@ -1,16 +0,0 @@ -[wrap-file] -directory = icu -source_url = https://github.com/unicode-org/icu/releases/download/release-76-1/icu4c-76_1-src.tgz -source_filename = icu4c-76_1-src.tgz -source_hash = dfacb46bfe4747410472ce3e1144bf28a102feeaa4e3875bac9b4c6cf30f4f3e -patch_filename = icu_76.1-2_patch.zip -patch_url = https://wrapdb.mesonbuild.com/v2/icu_76.1-2/get_patch -patch_hash = aa53ee7a3f742be81b597a7066d21777fcf9ab8f8793fa91b0565848854c27d6 -source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/icu_76.1-2/icu4c-76_1-src.tgz -wrapdb_version = 76.1-2 - -[provide] -icu-uc = icuuc_dep -icu-io = icuio_dep -icu-i18n = icui18n_dep -program_names = genbrk, genccode, gencmn diff --git a/tests/meson.build b/tests/meson.build index 722d7ee..4331e84 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,5 +1,5 @@ test_exe = executable('test_gtest', 'mainTest.cpp', - dependencies: [gmock_main_dep, gtest_dep, gmock_dep, icu_dep, icu_i18_dep, icu_data_dep], + dependencies: [gmock_main_dep, gtest_dep, gmock_dep, icu_dep, icu_i18_dep], link_with: faust_parser_lib, include_directories: faust_src_root_include) test('GTest Suite', test_exe)