Changeset 2e2cefdb in mainline for meson.build

Timestamp:

2019-08-17T12:49:43Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

d4b30cf

Parents:

45b26114

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-06-30 11:30:52)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2019-08-17 12:49:43)

Message:

Put configuration in build directory instead of source root

File:

• meson.build (modified) (3 diffs)

meson.build

@@ -176 +176 @@
 ]
 
+CONFIG_MAKEFILE = files(meson.build_root() / 'Makefile.config')
+
 foreach varname : config_variables
-        result = run_command(grep, '^' + varname + '\\b', meson.source_root() / 'Makefile.config')
+        result = run_command(grep, '^' + varname + '\\b', CONFIG_MAKEFILE)
         if result.returncode() != 0
                 # TODO: Output negative/inapplicable variables too in config, so that we can check for typos here.
@@ -220 +222 @@
 add_project_arguments(
         # TODO: Remove from project arguments and only use where needed.
-        '-imacros', join_paths(meson.source_root(), 'config.h'),
+        '-imacros', meson.build_root() / 'config.h',
         language : [ 'c' ],
 )
@@ -442 +444 @@
 
 # TODO: remove
-install_files += [[ 'config', meson.current_source_dir() / 'Makefile.config', 'Makefile.config' ]]
-install_deps += files('Makefile.config')
+install_files += [[ 'config', meson.build_root() / 'Makefile.config', 'Makefile.config' ]]
+install_deps += CONFIG_MAKEFILE
 
 if CONFIG_DEVEL_FILES