Changes in meson/part/tools/meson.build [145a13b:127cb7be] in mainline

File:

• meson/part/tools/meson.build (modified) (2 diffs)

meson/part/tools/meson.build

@@ -54 +54 @@
 which = find_program('which')
 cpc = find_program(_tools_dir / 'cc.sh')
-cppcheck = find_program('cppcheck', required: false)
 
 sh = [ find_program('sh'), '-u', '-e' ]
@@ -62 +61 @@
 
 genisoimage = find_program('genisoimage', required: false)
-if genisoimage.found()
-        genisoimage_type = 'genisoimage'
-else
+
+if not genisoimage.found()
         genisoimage = find_program('mkisofs', required: false)
-        if genisoimage.found()
-                genisoimage_type = 'mkisofs'
+endif
+
+if not genisoimage.found()
+        xorriso = find_program('xorriso', required: false)
+
+        if xorriso.found()
+                genisoimage = [ xorriso, '-as', 'genisoimage' ]
         else
-                xorriso = find_program('xorriso', required: false)
-                if xorriso.found()
-                        genisoimage = [ xorriso, '-as', 'genisoimage' ]
-                        genisoimage_type = 'genisoimage'
-                else
-                        error('Need genisoimage, mkisofs or xorriso.')
-                endif
+                error('Need genisoimage, mkisofs or xorriso.')
         endif
 endif