Changes in meson/part/tools/meson.build [127cb7be:145a13b] 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' ]
@@ -61 +62 @@
 
 genisoimage = find_program('genisoimage', required: false)
-
-if not genisoimage.found()
+if genisoimage.found()
+        genisoimage_type = 'genisoimage'
+else
         genisoimage = find_program('mkisofs', required: false)
-endif
-
-if not genisoimage.found()
-        xorriso = find_program('xorriso', required: false)
-
-        if xorriso.found()
-                genisoimage = [ xorriso, '-as', 'genisoimage' ]
+        if genisoimage.found()
+                genisoimage_type = 'mkisofs'
         else
-                error('Need genisoimage, mkisofs or xorriso.')
+                xorriso = find_program('xorriso', required: false)
+                if xorriso.found()
+                        genisoimage = [ xorriso, '-as', 'genisoimage' ]
+                        genisoimage_type = 'genisoimage'
+                else
+                        error('Need genisoimage, mkisofs or xorriso.')
+                endif
         endif
 endif