Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: benhoyt/inih
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 73245d9ca7d5f2b3d6ddc101037cd067079fd630
Choose a base ref
..
head repository: benhoyt/inih
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dac522ce63ea4a7a1cb38bbd27bbb813f0078f87
Choose a head ref
Showing with 28 additions and 4 deletions.
  1. +4 −0 INIReaderConfig.cmake.in
  2. +4 −0 inihConfig.cmake.in
  3. +20 −4 meson.build
4 changes: 4 additions & 0 deletions INIReaderConfig.cmake.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@PACKAGE_INIT@

set(inih_CFLAGS "${inih_CFLAGS}"
list(APPEND inih_CFLAGS "@EXTRA_CFLAGS@")
4 changes: 4 additions & 0 deletions inihConfig.cmake.in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@PACKAGE_INIT@

set(inih_CFLAGS "${inih_CFLAGS}"
list(APPEND inih_CFLAGS "@EXTRA_CFLAGS@")
24 changes: 20 additions & 4 deletions meson.build
View file
Original file line number Diff line number Diff line change
@@ -87,9 +87,17 @@ lib_inih = library('inih',
if distro_install
install_headers('ini.h')

cmake.write_basic_package_version_file(
cmdata = configuration_data()
if host_machine.system() == 'windows' and get_option('default_library') == 'shared'
cmdata.set('EXTRA_CFLAGS', '-DINI_SHARED_LIB')
else
cmdata.set('EXTRA_CFLAGS', '')
endif

cmake.configure_package_config_file(
name : 'inih',
version : meson.project_version(),
input : 'inihConfig.cmake.in',
configuration : cmdata,
)

pkg.generate(lib_inih,
@@ -127,9 +135,17 @@ if get_option('with_INIReader')
if distro_install
install_headers('cpp/INIReader.h')

cmake.write_basic_package_version_file(
cmdata = configuration_data()
if host_machine.system() == 'windows' and get_option('default_library') == 'shared'
cmdata.set('EXTRA_CFLAGS', '-DINI_SHARED_LIB')
else
cmdata.set('EXTRA_CFLAGS', '')
endif

cmake.configure_package_config_file(
name : 'INIReader',
version : meson.project_version(),
input : 'INIReaderConfig.cmake.in',
configuration : cmdata,
)

pkg.generate(lib_INIReader,