Add openslide_werror Meson option

Don't require build.sh or external direct Meson builds to know how to pass werror options directly to the OpenSlide and OpenSlide Java subprojects. Signed-off-by: Benjamin Gilbert <[email protected]>
openslide · Nov 1, 2023 · 141f696 · 141f696
1 parent 6a96886
commit 141f696
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/direct.yml b/.github/workflows/direct.yml
@@ -28,7 +28,7 @@ jobs:
         working-directory: meson
         run: |
           meson setup build --native-file native-linux-x86_64.ini \
-              -Dopenslide:werror=true -Dopenslide-java:werror=true
+              -Dopenslide_werror=true
           meson compile -C build
           DESTDIR=install meson install -C build
           mkdir output
@@ -67,7 +67,7 @@ jobs:
         run: |
           for arch in x86_64 arm64; do
               meson setup $arch --cross-file cross-macos-${arch}.ini \
-                  -Dopenslide:werror=true -Dopenslide-java:werror=true
+                  -Dopenslide_werror=true
               meson compile -C $arch
               DESTDIR=install meson install -C $arch
           done

diff --git a/build.sh b/build.sh
@@ -212,8 +212,7 @@ build() {
                 --cross-file "${cross_file}" \
                 "$build" meson \
                 ${ver_suffix:+-Dversion_suffix=${ver_suffix}} \
-                ${openslide_werror:+-Dopenslide:werror=true} \
-                ${openslide_werror:+-Dopenslide-java:werror=true}
+                ${openslide_werror}
     fi
     meson compile -C "$build" $parallel
     # When building multiple interdependent subpackages, we need to make sure
@@ -474,7 +473,7 @@ do
         ver_suffix="${OPTARG}"
         ;;
     w)
-        openslide_werror=1
+        openslide_werror="-Dopenslide_werror=true"
         ;;
     esac
 done

diff --git a/meson/meson.build b/meson/meson.build
@@ -140,6 +140,12 @@ subproject(
     'default_library=shared',
     'doc=disabled',
     'version_suffix=' + get_option('version_suffix'),
+    'werror=' + get_option('openslide_werror').to_string(),
+  ],
+)
+subproject(
+  'openslide-java',
+  default_options : [
+    'werror=' + get_option('openslide_werror').to_string(),
   ],
 )
-subproject('openslide-java')
diff --git a/meson/meson_options.txt b/meson/meson_options.txt
@@ -1,3 +1,9 @@
+option(
+  'openslide_werror',
+  type : 'boolean',
+  value : false,
+  description : 'Fail on compile warnings from OpenSlide/OpenSlide Java',
+)
 option(
   'version_suffix',
   type : 'string',