From 16d2627d1ebba3270aff574b4eb7a691da489fbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20V=C3=A1zquez=20Blanco?= Date: Wed, 26 Jun 2024 09:20:06 +0200 Subject: [PATCH] cwalk: fix compilation when both shared and static is wanted --- releases.json | 1 + subprojects/packagefiles/cwalk/meson.build | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/releases.json b/releases.json index 31d288511b..36efddea57 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/packagefiles/cwalk/meson.build b/subprojects/packagefiles/cwalk/meson.build index 45ebf6a2f7..94efcfa23c 100644 --- a/subprojects/packagefiles/cwalk/meson.build +++ b/subprojects/packagefiles/cwalk/meson.build @@ -1,20 +1,15 @@ 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 + c_shared_args: '-DCWK_SHARED' ) install_headers('include/cwalk.h')