From f680cc62f85e66feed2fe0794f415534d3a4df98 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 8 Feb 2018 13:10:12 -0800 Subject: [PATCH] meson: build getopt when using msvc v4: - Don't wrap a single file in a list to match mesa style - Use null_dep instead of empty list Reviewed-by: Eric Anholt (v3) Reviewed-by: Eric Engestrom --- src/getopt/meson.build | 29 +++++++++++++++++++++++++++++ src/meson.build | 5 +++++ 2 files changed, 34 insertions(+) create mode 100644 src/getopt/meson.build diff --git a/src/getopt/meson.build b/src/getopt/meson.build new file mode 100644 index 00000000000..9a1f666d7ae --- /dev/null +++ b/src/getopt/meson.build @@ -0,0 +1,29 @@ +# Copyright © 2018 Intel Corporation + +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: + +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. + +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +libgetopt = static_library( + 'getopt', + 'getopt_long.c', +) + +idep_getopt = declare_dependency( + link_with : libgetopt, + include_directories : include_directories('.', is_system : true), +) diff --git a/src/meson.build b/src/meson.build index d86c0ec21a6..71ff82af38f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -47,6 +47,11 @@ sha1_h = custom_target( ) subdir('gtest') +if cc.get_id() == 'msvc' + subdir('getopt') +else + idep_getopt = null_dep +endif subdir('util') subdir('mapi') # TODO: opengl -- 2.30.2