Commit 67486675 authored by Christian Hergert's avatar Christian Hergert

build: terminal is no longer optional

Using Builder without the terminal plugin is essentially non-functional
because we use it for VtePty to create PTYs.
parent 3924c750
...@@ -67,7 +67,6 @@ option('with_support', type: 'boolean') ...@@ -67,7 +67,6 @@ option('with_support', type: 'boolean')
option('with_symbol_tree', type: 'boolean') option('with_symbol_tree', type: 'boolean')
option('with_sysmon', type: 'boolean') option('with_sysmon', type: 'boolean')
option('with_sysprof', type: 'boolean') option('with_sysprof', type: 'boolean')
option('with_terminal', type: 'boolean')
option('with_todo', type: 'boolean') option('with_todo', type: 'boolean')
option('with_vala_pack', type: 'boolean') option('with_vala_pack', type: 'boolean')
option('with_valgrind', type: 'boolean') option('with_valgrind', type: 'boolean')
......
...@@ -136,7 +136,6 @@ status += [ ...@@ -136,7 +136,6 @@ status += [
'Symbol Tree ........... : @0@'.format(get_option('with_symbol_tree')), 'Symbol Tree ........... : @0@'.format(get_option('with_symbol_tree')),
'System Monitor ........ : @0@'.format(get_option('with_sysmon')), 'System Monitor ........ : @0@'.format(get_option('with_sysmon')),
'Sysprof Profiler ...... : @0@'.format(get_option('with_sysprof')), 'Sysprof Profiler ...... : @0@'.format(get_option('with_sysprof')),
'Terminal .............. : @0@'.format(get_option('with_terminal')),
'Todo .................. : @0@'.format(get_option('with_todo')), 'Todo .................. : @0@'.format(get_option('with_todo')),
'Vala Language Pack .... : @0@'.format(get_option('with_vala_pack')), 'Vala Language Pack .... : @0@'.format(get_option('with_vala_pack')),
'Valgrind .............. : @0@'.format(get_option('with_valgrind')), 'Valgrind .............. : @0@'.format(get_option('with_valgrind')),
......
...@@ -28,10 +28,8 @@ project_tree_sources = [ ...@@ -28,10 +28,8 @@ project_tree_sources = [
'project-tree-plugin.c', 'project-tree-plugin.c',
] ]
if get_option('with_terminal') gnome_builder_plugins_deps += dependency('vte-2.91', version: '>=0.40.2')
gnome_builder_plugins_deps += dependency('vte-2.91', version: '>=0.40.2') gnome_builder_plugins_args += '-DHAVE_VTE'
gnome_builder_plugins_args += '-DHAVE_VTE'
endif
gnome_builder_plugins_sources += files(project_tree_sources) gnome_builder_plugins_sources += files(project_tree_sources)
gnome_builder_plugins_sources += project_tree_resources[0] gnome_builder_plugins_sources += project_tree_resources[0]
......
if get_option('with_terminal')
terminal_resources = gnome.compile_resources( terminal_resources = gnome.compile_resources(
'terminal-resources', 'terminal-resources',
'terminal.gresource.xml', 'terminal.gresource.xml',
...@@ -31,5 +29,3 @@ gnome_builder_plugins_deps += [ ...@@ -31,5 +29,3 @@ gnome_builder_plugins_deps += [
gnome_builder_plugins_sources += files(terminal_sources) gnome_builder_plugins_sources += files(terminal_sources)
gnome_builder_plugins_sources += terminal_resources[0] gnome_builder_plugins_sources += terminal_resources[0]
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment