diff --git a/build-config/yaml-cpp/meson.build b/build-config/yaml-cpp/meson.build index 1a8dcfe..6b3ba27 100644 --- a/build-config/yaml-cpp/meson.build +++ b/build-config/yaml-cpp/meson.build @@ -3,7 +3,9 @@ yaml_cpp_cmake_options.add_cmake_defines({ 'CMAKE_POLICY_VERSION_MINIMUM': '3.5', 'BUILD_SHARED_LIBS': 'ON', 'CMAKE_SKIP_INSTALL_RULES': 'ON', - 'YAML_CPP_BUILD_TESTS': 'OFF' + 'YAML_CPP_BUILD_TESTS': 'OFF', + 'CMAKE_CXX_FLAGS': '-Wno-shadow', + 'CMAKE_C_FLAGS': '-Wno-shadow', }) yaml_cpp_sp = cmake.subproject( 'yaml-cpp', diff --git a/meson.build b/meson.build index b6f17b3..59db906 100644 --- a/meson.build +++ b/meson.build @@ -18,7 +18,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # *********************************************************************** # -project('libconfig', 'cpp', version: 'v1.1.0', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') +project('libconfig', 'cpp', version: 'v1.1.1', default_options: ['cpp_std=c++23'], meson_version: '>=1.5.0') # Add default visibility for all C++ targets add_project_arguments('-fvisibility=default', language: 'cpp') @@ -40,4 +40,4 @@ if get_option('pkg-config') filebase: 'fourdst_config', install_dir: join_paths(get_option('libdir'), 'pkgconfig') ) -endif \ No newline at end of file +endif diff --git a/subprojects/packagefiles/yaml-cpp/disableShadowWarnings.patch b/subprojects/packagefiles/yaml-cpp/disableShadowWarnings.patch new file mode 100644 index 0000000..174af7f --- /dev/null +++ b/subprojects/packagefiles/yaml-cpp/disableShadowWarnings.patch @@ -0,0 +1,10 @@ +--- yaml-cpp/CMakeLists.txt.orig 2025-07-24 08:18:01 ++++ yaml-cpp/CMakeLists.txt 2025-07-24 08:18:25 +@@ -93,7 +93,6 @@ + + target_compile_options(yaml-cpp + PRIVATE +- $<${not-msvc}:-Wall -Wextra -Wshadow -Weffc++ -Wno-long-long> + $<${not-msvc}:-pedantic -pedantic-errors> + + $<$:-MTd> diff --git a/subprojects/yaml-cpp.wrap b/subprojects/yaml-cpp.wrap index df0133d..a8712f2 100644 --- a/subprojects/yaml-cpp.wrap +++ b/subprojects/yaml-cpp.wrap @@ -1,5 +1,6 @@ [wrap-git] url = https://github.com/jbeder/yaml-cpp.git revision = yaml-cpp-0.7.0 +diff_files = yaml-cpp/disableShadowWarnings.patch -[cmake] \ No newline at end of file +[cmake]