diff options
| -rw-r--r-- | meson.build | 44 | ||||
| -rw-r--r-- | meson_options.txt | 6 |
2 files changed, 16 insertions, 34 deletions
diff --git a/meson.build b/meson.build index 04ed2a20f8..96b33180ed 100644 --- a/meson.build +++ b/meson.build @@ -243,12 +243,6 @@ endif ecore_evas_wayland_engine_include_dir = [] -boot_strap_eolian = [ - ['evil' ,[] , false, true, false, false, false, false, [], []], - ['eina' ,[] , false, true, false, false, false, false, [], []], - ['eolian' ,[] , false, true, true, false, false, false, ['eina'], []], -] - evas_lib = ['evas' ,[], false, true, false, false, true, true, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']] evas_img_modules = ['evas' ,[], true, false, false, false, false, false, ['eina', 'efl', 'eo'], ['vg_common', 'libunibreak']] evas_engines = [join_paths('evas', 'engines'),[], true, false, false, false, false, false, [], []] @@ -331,10 +325,6 @@ test_dirs = [] example_dirs = [] tmp_empty = declare_dependency() -if get_option('eolian-bootstrap') - subprojects = boot_strap_eolian -endif - foreach package : subprojects package_name = package[0] package_version_name = '-'.join(package_name.split('_')) + '-' + version_major @@ -434,28 +424,26 @@ foreach package : subprojects endforeach -subdir('cmakeconfig') #build this later, as the debug services are depending on ecore -if get_option('eolian-bootstrap') == false - subdir(join_paths('src', 'bin', 'efl')) +subdir(join_paths('src', 'bin', 'efl')) - subdir(join_paths('src', 'generic', 'evas')) - if sys_windows == false - subdir(join_paths('src', 'generic', 'emotion')) - endif +subdir(join_paths('src', 'generic', 'evas')) +if sys_windows == false + subdir(join_paths('src', 'generic', 'emotion')) +endif +subdir('cmakeconfig') - bindings = get_option('bindings') - bindings_order = ['luajit', 'cxx', 'mono'] +bindings = get_option('bindings') +bindings_order = ['luajit', 'cxx', 'mono'] - foreach binding : bindings_order - if bindings.contains(binding) - subdir(join_paths('src', 'bindings', binding)) - endif - endforeach +foreach binding : bindings_order + if bindings.contains(binding) + subdir(join_paths('src', 'bindings', binding)) + endif +endforeach - subdir(join_paths('src', 'edje_external')) - subdir(join_paths('data')) -endif +subdir(join_paths('src', 'edje_external')) +subdir(join_paths('data')) if get_option('build-tests') check = dependency('check') @@ -484,7 +472,7 @@ endforeach doxygen = find_program('doxygen', required : false) -if get_option('eolian-bootstrap') == false and doxygen.found() +if doxygen.found() subdir('doc') endif diff --git a/meson_options.txt b/meson_options.txt index 0b6b0bb917..79081a71bc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -367,12 +367,6 @@ option('elementary-base-dir', description : 'Put the name of a base directory for elementary data' ) -option('eolian-bootstrap', - type : 'boolean', - value : false, - description : 'Only build efl up to eolian_gen and install eina libeolian and eolian_gen, usefull for cross compiles' -) - option('install-eo-files', type: 'boolean', value: false, |