diff --git a/subprojects/packagefiles/libopenjp2/meson_options.txt b/subprojects/packagefiles/libopenjp2/meson_options.txt index 0a971dd74..2eecb943f 100644 --- a/subprojects/packagefiles/libopenjp2/meson_options.txt +++ b/subprojects/packagefiles/libopenjp2/meson_options.txt @@ -10,7 +10,6 @@ option('build_jpip_server', type : 'boolean', value : false, description : 'Buil option('build_viewer', type : 'boolean', value : false, description : 'Build the OPJViewer executable (C++)') option('build_java', type : 'boolean', value : false, description : 'Build the openjpeg jar (Java)') option('build_testing', type : 'boolean', value : false, description : 'Build the tests.') -option('build_pkgconfig_files', type : 'boolean', value : true, description : 'Build and install pkg-config files') option('with_astyle', type : 'boolean', value : false, description : 'Build with astyle') option('bin_png', type : 'boolean', value : false, description : 'Build binaries with libpng') option('bin_tiff', type : 'boolean', value : false, description : 'Build binaries with libtiff') diff --git a/subprojects/packagefiles/libopenjp2/src/lib/meson.build b/subprojects/packagefiles/libopenjp2/src/lib/meson.build index 5e008a657..b3691a433 100644 --- a/subprojects/packagefiles/libopenjp2/src/lib/meson.build +++ b/subprojects/packagefiles/libopenjp2/src/lib/meson.build @@ -7,16 +7,15 @@ if get_option('build_jpip') subdir('openjpip') endif -if get_option('build_pkgconfig_files') - pkgconfig = import('pkgconfig') - pkgconfig.generate(openjp2_lib, name: 'libopenjp2', - description: 'JPEG2000 library (Part 1 and 2)', - version: meson.project_version(), - libraries: openjp2_lib) - if get_option('build_jpip') - pkgconfig.generate(openjpip_lib, name: 'libopenjpip', - description: 'JPEG2000 Interactivity tools, APIs and protocols (Part 9)', - version: meson.project_version(), - libraries: openjpip_lib) - endif + +pkgconfig = import('pkgconfig') +pkgconfig.generate(openjp2_lib, name: 'libopenjp2', + description: 'JPEG2000 library (Part 1 and 2)', + version: meson.project_version(), + libraries: openjp2_lib) +if get_option('build_jpip') + pkgconfig.generate(openjpip_lib, name: 'libopenjpip', + description: 'JPEG2000 Interactivity tools, APIs and protocols (Part 9)', + version: meson.project_version(), + libraries: openjpip_lib) endif