summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-12-27 11:54:30 +0000
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2018-12-27 11:54:30 +0000
commit91990b7cf8024d13a89edbeddb873869eda21a87 (patch)
tree864f7a64deb0ff0d6186800994f02cbfae18ed07
parent318d16846fb4fd7092befe72ffa24ff0052abc93 (diff)
meson - fix pc file versions that were missing mirco version
-rw-r--r--src/bindings/cxx/meson.build2
-rw-r--r--src/bindings/mono/meson.build2
-rw-r--r--src/lib/efreet/meson.build4
-rw-r--r--src/lib/eina/meson.build2
-rw-r--r--src/lib/evas_goal/meson.build2
5 files changed, 6 insertions, 6 deletions
diff --git a/src/bindings/cxx/meson.build b/src/bindings/cxx/meson.build
index f4b99f6c46..11c716a4c6 100644
--- a/src/bindings/cxx/meson.build
+++ b/src/bindings/cxx/meson.build
@@ -104,7 +104,7 @@ foreach lib : cxx_sublibs
104 name : '-'.join(package_name.split('_')) + '-cxx', 104 name : '-'.join(package_name.split('_')) + '-cxx',
105 description : lib[0]+' cxx bindings', 105 description : lib[0]+' cxx bindings',
106 subdirs : tmp_package_subdirs, 106 subdirs : tmp_package_subdirs,
107 version : version_major + '.' + version_minor, 107 version : version_major + '.' + version_minor + '.' + version_micro,
108 libraries : dep, 108 libraries : dep,
109 requires : growing_deps + [package_name], 109 requires : growing_deps + [package_name],
110 ) 110 )
diff --git a/src/bindings/mono/meson.build b/src/bindings/mono/meson.build
index 2bcab9bf82..4710e4c0cc 100644
--- a/src/bindings/mono/meson.build
+++ b/src/bindings/mono/meson.build
@@ -124,7 +124,7 @@ efl_mono_test_suite_path=join_paths(meson.current_build_dir())
124pkgconfig.generate( 124pkgconfig.generate(
125 name : 'efl-mono', 125 name : 'efl-mono',
126 description : 'Efl C# bindings', 126 description : 'Efl C# bindings',
127 version : version_major + '.' + version_minor, 127 version : version_major + '.' + version_minor + '.' + version_micro,
128 libraries : ['-r:${assemblies_dir}/efl_mono.dll'], 128 libraries : ['-r:${assemblies_dir}/efl_mono.dll'],
129 variables : ['assemblies_dir='+join_paths(dir_lib, 'efl-mono-'+version_major), 129 variables : ['assemblies_dir='+join_paths(dir_lib, 'efl-mono-'+version_major),
130 'mono_libs=-r:${assemblies_dir}/efl_mono.dll'] 130 'mono_libs=-r:${assemblies_dir}/efl_mono.dll']
diff --git a/src/lib/efreet/meson.build b/src/lib/efreet/meson.build
index fc4a232c38..ea4ef9a6c0 100644
--- a/src/lib/efreet/meson.build
+++ b/src/lib/efreet/meson.build
@@ -84,13 +84,13 @@ install_headers(efreet_header_src,
84pkgconfig.generate(efreet_mime_lib, 84pkgconfig.generate(efreet_mime_lib,
85 name : 'efreet-mime', 85 name : 'efreet-mime',
86 subdirs : package_version_name, 86 subdirs : package_version_name,
87 version : version_major + '.' + version_minor, 87 version : version_major + '.' + version_minor + '.' + version_micro,
88 libraries : [tmp_deps] + tmp_pub_deps, 88 libraries : [tmp_deps] + tmp_pub_deps,
89) 89)
90 90
91pkgconfig.generate(efreet_trash_lib, 91pkgconfig.generate(efreet_trash_lib,
92 name : 'efreet-trash', 92 name : 'efreet-trash',
93 subdirs : package_version_name, 93 subdirs : package_version_name,
94 version : version_major + '.' + version_minor, 94 version : version_major + '.' + version_minor + '.' + version_micro,
95 libraries : [tmp_deps] + tmp_pub_deps, 95 libraries : [tmp_deps] + tmp_pub_deps,
96) 96)
diff --git a/src/lib/eina/meson.build b/src/lib/eina/meson.build
index 8a445f4056..245c9cd8fa 100644
--- a/src/lib/eina/meson.build
+++ b/src/lib/eina/meson.build
@@ -400,6 +400,6 @@ automatic_pkgfile = false
400pkgconfig.generate(eina_lib, 400pkgconfig.generate(eina_lib,
401 name : 'eina', 401 name : 'eina',
402 subdirs : ['eina-'+version_major, 'efl-'+version_major, join_paths('eina-'+version_major, 'eina')], 402 subdirs : ['eina-'+version_major, 'efl-'+version_major, join_paths('eina-'+version_major, 'eina')],
403 version : version_major + '.' + version_minor, 403 version : version_major + '.' + version_minor + '.' + version_micro,
404 libraries : eina_pub_deps, 404 libraries : eina_pub_deps,
405) 405)
diff --git a/src/lib/evas_goal/meson.build b/src/lib/evas_goal/meson.build
index d233520925..60426ad526 100644
--- a/src/lib/evas_goal/meson.build
+++ b/src/lib/evas_goal/meson.build
@@ -31,6 +31,6 @@ endforeach
31pkgconfig.generate(evas_lib, 31pkgconfig.generate(evas_lib,
32 name : 'evas', 32 name : 'evas',
33 subdirs : ['evas-'+version_major] + tmp_package_subdirs, 33 subdirs : ['evas-'+version_major] + tmp_package_subdirs,
34 version : version_major + '.' + version_minor, 34 version : version_major + '.' + version_minor + '.' + version_micro,
35 libraries : [eina, ecore, ector, emile, dependency('luajit')], 35 libraries : [eina, ecore, ector, emile, dependency('luajit')],
36) 36)