smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93 from kiwix/pkg_config_version 

Fix version in pkg_config.
This commit is contained in:
Matthieu Gautier 2017-10-23 18:14:56 +02:00 committed by GitHub
parent 48078c809b d4f0344d9d
commit f0bcb1960b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kiwix.pc.in
View File

@ -4,7 +4,7 @@ includedir=${prefix}/include
Name: libkiwix Name: libkiwix
Description: A library that contains a lot of things used by used by other kiwix programs Description: A library that contains a lot of things used by used by other kiwix programs
Version: 1.0 Version: @version@
Requires: @requires@ Requires: @requires@
Libs: -L${libdir} -lkiwix @extra_libs@ Libs: -L${libdir} -lkiwix @extra_libs@
Cflags: -I${includedir}/ @extra_cflags@ Cflags: -I${includedir}/ @extra_cflags@

3
meson.build
View File

@ -1,5 +1,5 @@
project('kiwixlib', 'cpp', project('kiwixlib', 'cpp',
version : '1.0.0', version : '1.0.1',
license : 'GPL', license : 'GPL',
default_options : ['c_std=c11', 'cpp_std=c++11']) default_options : ['c_std=c11', 'cpp_std=c++11'])
@ -101,6 +101,7 @@ pkg_conf.set('prefix', get_option('prefix'))
pkg_conf.set('requires', ' '.join(pkg_requires)) pkg_conf.set('requires', ' '.join(pkg_requires))
pkg_conf.set('extra_libs', ' '.join(extra_libs)) pkg_conf.set('extra_libs', ' '.join(extra_libs))
pkg_conf.set('extra_cflags', extra_cflags) pkg_conf.set('extra_cflags', extra_cflags)
pkg_conf.set('version', meson.project_version())
configure_file(output : 'kiwix.pc', configure_file(output : 'kiwix.pc',
configuration : pkg_conf, configuration : pkg_conf,
input : 'kiwix.pc.in', input : 'kiwix.pc.in',