From cebc6c12811d28e4ee9c1e114474b714deb052ef Mon Sep 17 00:00:00 2001 From: subhransu mohanty Date: Fri, 19 Jul 2019 15:24:06 +0900 Subject: [PATCH] meson: move generation of cmake config file to cmake option flag --- meson.build | 2 +- meson_options.txt | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index b75cf0edf2..e4d1669aec 100644 --- a/meson.build +++ b/meson.build @@ -52,7 +52,7 @@ if get_option('test') == true endif -if host_machine.system() != 'windows' +if get_option('cmake') == true and host_machine.system() != 'windows' cmake_bin = find_program('cmake', required: false) if cmake_bin.found() cmake = import('cmake') diff --git a/meson_options.txt b/meson_options.txt index cada55c6e4..bf4a854b3e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -33,8 +33,10 @@ option('example', value: true, description: 'Enable building examples') -option('text', - type: 'boolean', - value: false, - description: 'Enable text module') +option('cmake', + type: 'boolean', + value: false, + description: 'Enable Generating CMake config files') + +