[Mesa-dev] [PATCH v3 09/48] meson: build getopt when using msvc

[Eric Engestrom]

On Monday, 2018-08-06 17:50:49 -0700, Dylan Baker wrote:
> completely untested
> ---
>  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..5e106a6bc60
> --- /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'],

nit-picky nit: plain 'getopt_long.c' like we do in other single-file places

> +)
> +
> +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 6213b7d8a36..bc0508bce3f 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

Looks reasonable otherwise:
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>

> +endif
>  subdir('util')
>  subdir('mapi')
>  # TODO: opengl
> -- 
> 2.18.0
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev