Changeset 84876aa4 in mainline for meson/part/extra_targets/meson.build

Timestamp:

2019-11-15T13:46:34Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ecb7828

Parents:

b093a62 (diff), d548fc0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master into gfx

Mainly to get XCW fixes

File:

• meson/part/extra_targets/meson.build (modified) (1 diff)

meson/part/extra_targets/meson.build

@@ -72 +72 @@
         )
 
-        run_target('doxygen', command: [ doxygen, _dox_cfg ])
+        run_target('doxygen', command: [
+                sh,
+                '-c', 'cd $1 && $2 $3',
+                '--',
+                meson.source_root() / 'doxygen',
+                doxygen.path(),
+                _dox_cfg,
+        ])
 endif