mirror of
				https://gitlab.freedesktop.org/wlroots/wlroots.git
				synced 2025-11-03 09:01:40 -05:00 
			
		
		
		
	Install include directory into includedir
Follow includedir parameter when installing include directory.
This commit is contained in:
		
							parent
							
								
									506acbdecd
								
							
						
					
					
						commit
						f83ad3f3ef
					
				
					 2 changed files with 6 additions and 3 deletions
				
			
		| 
						 | 
					@ -9,5 +9,6 @@ version_data.set('WLR_VERSION_API_CURRENT',  so_version[0])
 | 
				
			||||||
version_data.set('WLR_VERSION_API_REVISION', so_version[1])
 | 
					version_data.set('WLR_VERSION_API_REVISION', so_version[1])
 | 
				
			||||||
version_data.set('WLR_VERSION_API_AGE',      so_version[2])
 | 
					version_data.set('WLR_VERSION_API_AGE',      so_version[2])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
configure_file(output: 'config.h',  install_dir: 'include/wlr', configuration: conf_data)
 | 
					wlr_inc_dest = join_paths(get_option('includedir'), 'wlr')
 | 
				
			||||||
configure_file(output: 'version.h', install_dir: 'include/wlr', configuration: version_data)
 | 
					configure_file(output: 'config.h',  install_dir: wlr_inc_dest, configuration: conf_data)
 | 
				
			||||||
 | 
					configure_file(output: 'version.h', install_dir: wlr_inc_dest, configuration: version_data)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -125,8 +125,10 @@ if get_option('enable-xwayland')
 | 
				
			||||||
else
 | 
					else
 | 
				
			||||||
	exclude_headers += 'xwayland.h'
 | 
						exclude_headers += 'xwayland.h'
 | 
				
			||||||
endif
 | 
					endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					includedir = get_option('includedir')
 | 
				
			||||||
exclude_headers += 'meson.build'
 | 
					exclude_headers += 'meson.build'
 | 
				
			||||||
install_subdir('include/wlr', install_dir: 'include', exclude_files: exclude_headers)
 | 
					install_subdir('include/wlr', install_dir: includedir, exclude_files: exclude_headers)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
subdir('include')
 | 
					subdir('include')
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue