diff --git a/releases.json b/releases.json index 31d288511..36efddea5 100644 --- a/releases.json +++ b/releases.json @@ -513,6 +513,7 @@ "cwalk" ], "versions": [ + "1.2.9-2", "1.2.9-1" ] }, diff --git a/subprojects/cwalk.wrap b/subprojects/cwalk.wrap index baf483760..92c9dfc4c 100644 --- a/subprojects/cwalk.wrap +++ b/subprojects/cwalk.wrap @@ -6,4 +6,4 @@ source_hash = 54f160031687ec90a414e0656cf6266445207cb91b720dacf7a7c415d6bc7108 patch_directory = cwalk [provide] -cwalk = cwalk_dep +dependency_names = cwalk \ No newline at end of file diff --git a/subprojects/packagefiles/cwalk/meson.build b/subprojects/packagefiles/cwalk/meson.build index 45ebf6a2f..5584d73d1 100644 --- a/subprojects/packagefiles/cwalk/meson.build +++ b/subprojects/packagefiles/cwalk/meson.build @@ -1,29 +1,30 @@ project('cwalk', 'c', license: 'MIT', version: '1.2.9', - meson_version: '>= 0.57.0' + meson_version: '>= 1.3.0' ) cwalk_inc = include_directories('include') -cwalk_c_args = [] -if get_option('default_library') != 'static' - cwalk_c_args += '-DCWK_SHARED' -endif - cwalk = library('cwalk', 'src/cwalk.c', install: true, include_directories: cwalk_inc, - c_args: cwalk_c_args + gnu_symbol_visibility: 'hidden', + c_args: '-DCWK_EXPORTS', + c_shared_args: '-DCWK_SHARED' ) +pkg = import('pkgconfig') +pkg.generate(cwalk) + install_headers('include/cwalk.h') -cwalk_dep = declare_dependency(include_directories: 'include', link_with: cwalk) +cwalk_dep = declare_dependency( + include_directories: 'include', + link_with: cwalk +) if get_option('ENABLE_TESTS') subdir('test') endif -pkg = import('pkgconfig') -pkg.generate(cwalk)