pkg-config files should always be generated

Remove option for pkg-config files generation
mesonbuild · Oct 25, 2021 · e3decba · e3decba
1 parent 4d02f6a
commit e3decba
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/subprojects/packagefiles/libopenjp2/meson_options.txt b/subprojects/packagefiles/libopenjp2/meson_options.txt
@@ -10,5 +10,4 @@ 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')
diff --git 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