Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Buildsystem improvements #1467

Merged
merged 2 commits into from
Jul 5, 2023
Merged

Buildsystem improvements #1467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5e2db1
meson: Install generated header files
syyyr Jul 4, 2023
7f21f7d
meson: Generate pkgconfig files
syyyr Jul 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions libosmscout-client-qt/include/osmscoutclientqt/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
clientqtFeaturesCfg = configuration_data()

configure_file(output: 'ClientQtFeatures.h',
install_dir: 'include/osmscoutclientqt',
configuration: clientqtFeaturesCfg)

3 changes: 2 additions & 1 deletion libosmscout-client-qt/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ endforeach
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscoutclientqt)
1 change: 1 addition & 0 deletions libosmscout-client/include/osmscoutclient/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ clientFeaturesCfg = configuration_data()
clientFeaturesCfg.set('OSMSCOUT_CLIENT_MESON_BUILD',true, description: 'we are building using meson')

configure_file(output: 'ClientFeatures.h',
install_dir: 'include/osmscoutclient',
configuration: clientFeaturesCfg)

3 changes: 2 additions & 1 deletion libosmscout-client/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,5 @@ osmscoutclient = library('osmscout_client',
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscoutclient)
1 change: 1 addition & 0 deletions libosmscout-gpx/include/osmscoutgpx/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ gpxFeaturesCfg.set('OSMSCOUT_GPX_HAVE_LIB_XML',xml2Dep.found(), description: '*.
gpxFeaturesCfg.set('OSMSCOUT_GPX_MESON_BUILD',true, description: 'we are building using meson')

configure_file(output: 'GPXFeatures.h',
install_dir: 'include/osmscoutgpx',
configuration: gpxFeaturesCfg)

3 changes: 2 additions & 1 deletion libosmscout-gpx/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ osmscoutgpx = library('osmscout_gpx',
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscoutgpx)
1 change: 1 addition & 0 deletions libosmscout-import/include/osmscoutimport/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ importFeaturesCfg.set('OSMSCOUT_DEBUG_COASTLINE',false, description: 'Extra debu
importFeaturesCfg.set('OSMSCOUT_DEBUG_TILING',false, description: 'Extra debugging of water index tiling')

configure_file(output: 'ImportFeatures.h',
install_dir: 'include/osmscoutimport',
configuration: importFeaturesCfg)

3 changes: 2 additions & 1 deletion libosmscout-import/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ osmscoutimport = library('osmscout_import',
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscoutimport)
1 change: 1 addition & 0 deletions libosmscout-map-agg/include/osmscoutmapagg/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
mapaggFeaturesCfg = configuration_data()

configure_file(output: 'MapAggFeatures.h',
install_dir: 'include/osmscoutmapagg',
configuration: mapaggFeaturesCfg)

3 changes: 2 additions & 1 deletion libosmscout-map-agg/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ osmscoutmapagg = library('osmscout_map_agg',
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscoutmapagg)
1 change: 1 addition & 0 deletions libosmscout-map-cairo/include/osmscoutmapcairo/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ mapcairoFeaturesCfg = configuration_data()
mapcairoFeaturesCfg.set('OSMSCOUT_MAP_CAIRO_HAVE_LIB_PANGO',pangoDep.found() and pangocairoDep.found(), description: 'text drawing using pango is supported')

configure_file(output: 'MapCairoFeatures.h',
install_dir: 'include/osmscoutmapcairo',
configuration: mapcairoFeaturesCfg)

3 changes: 2 additions & 1 deletion libosmscout-map-cairo/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ osmscoutmapcairo = library('osmscout_map_cairo',
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscoutmapcairo)
1 change: 1 addition & 0 deletions libosmscout-map-directx/include/osmscoutmapdirectx/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
mapdirectxFeaturesCfg = configuration_data()

configure_file(output: 'MapDirectXFeatures.h',
install_dir: 'include/osmscoutmapdirectx',
configuration: mapdirectxFeaturesCfg)

3 changes: 2 additions & 1 deletion libosmscout-map-directx/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ osmscoutmapdirectx = library('osmscout_map_directx',
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscoutmapdirectx)
3 changes: 2 additions & 1 deletion libosmscout-map-gdi/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ osmscoutmapgdi = library('osmscout_map_gdi',
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscoutmapgdi)
3 changes: 2 additions & 1 deletion libosmscout-map-iosx/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ osmscoutmapiosx = library('osmscout_map_iosx',
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscoutmapiosx)
1 change: 1 addition & 0 deletions libosmscout-map-opengl/include/osmscoutmapopengl/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ mapopenglFeaturesCfg.set('SHADER_INSTALL_DIR','"shaders"', description: 'OpenGL
mapopenglFeaturesCfg.set('DEFAULT_FONT_FILE','"LiberationSans-Regular.ttf"', description: 'OpenGL default font path')

configure_file(output: 'MapOpenGLFeatures.h',
install_dir: 'include/osmscoutmapopengl',
configuration: mapopenglFeaturesCfg)

3 changes: 2 additions & 1 deletion libosmscout-map-opengl/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ osmscoutmapopengl = library('osmscout_map_opengl',
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscoutmapopengl)
1 change: 1 addition & 0 deletions libosmscout-map-qt/include/osmscoutmapqt/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
mapqtFeaturesCfg = configuration_data()

configure_file(output: 'MapQtFeatures.h',
install_dir: 'include/osmscoutmapqt',
configuration: mapqtFeaturesCfg)

3 changes: 2 additions & 1 deletion libosmscout-map-qt/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ osmscoutmapqt = library('osmscout_map_qt',
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscoutmapqt)
1 change: 1 addition & 0 deletions libosmscout-map-svg/include/osmscoutmapsvg/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
mapsvgFeaturesCfg = configuration_data()

configure_file(output: 'MapSVGFeatures.h',
install_dir: 'include/osmscoutmapsvg',
configuration: mapsvgFeaturesCfg)

3 changes: 2 additions & 1 deletion libosmscout-map-svg/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ osmscoutmapsvg = library('osmscout_map_svg',
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscoutmapsvg)
1 change: 1 addition & 0 deletions libosmscout-map/include/osmscoutmap/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ mapFeaturesCfg.set('OSMSCOUT_DEBUG_LABEL_LAYOUTER',false, description: 'Extra de
mapFeaturesCfg.set('OSMSCOUT_DEBUG_GROUNDTILES',false, description: 'Extra debugging of ground tiles rendering')

configure_file(output: 'MapFeatures.h',
install_dir: 'include/osmscoutmap',
configuration: mapFeaturesCfg)

3 changes: 2 additions & 1 deletion libosmscout-map/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ osmscoutmap = library('osmscout_map',
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscoutmap)
1 change: 1 addition & 0 deletions libosmscout-test/include/osmscout-test/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ testFeaturesCfg = configuration_data()
testFeaturesCfg.set('OSMSCOUT_TEST_MESON_BUILD',true, description: 'we are building using meson')

configure_file(output: 'TestFeatures.h',
install_dir: 'include/osmscout-test',
configuration: testFeaturesCfg)

3 changes: 2 additions & 1 deletion libosmscout-test/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ osmscouttest = library('osmscout_test',
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscouttest)
1 change: 1 addition & 0 deletions libosmscout/include/osmscout/lib/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ coreFeaturesCfg.set('OSMSCOUT_HAVE_LIB_MARISA',marisaDep.found(), description: '
coreFeaturesCfg.set('OSMSCOUT_DEBUG_ROUTING',false, description: 'Extra debugging of routing')

configure_file(output: 'CoreFeatures.h',
install_dir: 'include/osmscout/lib',
configuration: coreFeaturesCfg)

3 changes: 2 additions & 1 deletion libosmscout/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,5 @@ osmscout = library('osmscout',
version: libraryVersion,
install: true)

# TODO: Generate PKG_CONFIG file
pkg = import('pkgconfig')
pkg.generate(osmscout)
Loading