mirror of
				https://gitlab.freedesktop.org/pipewire/pipewire.git
				synced 2025-10-29 05:40:27 -04:00 
			
		
		
		
	meson.build: make spa-json-dump available for subprojects
Add override that provides host binary for subprojects to use. Also fix cross-compilation to use the host binary.
This commit is contained in:
		
							parent
							
								
									0b0912cc5b
								
							
						
					
					
						commit
						5fa137cc0d
					
				
					 2 changed files with 15 additions and 2 deletions
				
			
		|  | @ -18,6 +18,13 @@ spa_dep = declare_dependency( | ||||||
|   }, |   }, | ||||||
| ) | ) | ||||||
| 
 | 
 | ||||||
|  | spa_inc_dep = declare_dependency( | ||||||
|  |   include_directories : [ | ||||||
|  |     include_directories('include'), | ||||||
|  |     include_directories('include-private'), | ||||||
|  |   ], | ||||||
|  | ) | ||||||
|  | 
 | ||||||
| meson.override_dependency('lib@0@'.format(spa_name), spa_dep) | meson.override_dependency('lib@0@'.format(spa_name), spa_dep) | ||||||
| 
 | 
 | ||||||
| pkgconfig.generate(filebase : 'lib@0@'.format(spa_name), | pkgconfig.generate(filebase : 'lib@0@'.format(spa_name), | ||||||
|  |  | ||||||
|  | @ -6,6 +6,12 @@ executable('spa-monitor', 'spa-monitor.c', | ||||||
|            dependencies : [ spa_dep, dl_lib ], |            dependencies : [ spa_dep, dl_lib ], | ||||||
|            install : true) |            install : true) | ||||||
| 
 | 
 | ||||||
| spa_json_dump_exe = executable('spa-json-dump', 'spa-json-dump.c', | spa_json_dump = executable('spa-json-dump', 'spa-json-dump.c', | ||||||
|            dependencies : [ spa_dep, dl_lib, ], |            dependencies : [ spa_dep ], | ||||||
|            install : true) |            install : true) | ||||||
|  | 
 | ||||||
|  | spa_json_dump_exe = executable('spa-json-dump-native', 'spa-json-dump.c', | ||||||
|  |            dependencies : [ spa_inc_dep ], | ||||||
|  |            native : true) | ||||||
|  | 
 | ||||||
|  | meson.override_find_program('spa-json-dump', spa_json_dump_exe) | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Pauli Virtanen
						Pauli Virtanen