diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-12-10 14:23:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-10 14:23:31 +0200 |
commit | 5ff9e05c8bf05304b80a1c21cbbc11f4d5269ff0 (patch) | |
tree | bcda526499a6cf39ae1fba017b4dd8f9aa073956 /mesonbuild/backend/vs2010backend.py | |
parent | 2c4e7ebb9b8567ebe198b2d436963dacf667a093 (diff) | |
parent | 664771bb534b007127786e62cb43bac0cb305f93 (diff) | |
download | meson-5ff9e05c8bf05304b80a1c21cbbc11f4d5269ff0.zip meson-5ff9e05c8bf05304b80a1c21cbbc11f4d5269ff0.tar.gz meson-5ff9e05c8bf05304b80a1c21cbbc11f4d5269ff0.tar.bz2 |
Merge pull request #2697 from mesonbuild/custom-target-depends-serialize
custom target: Consider all build depends while serializing
Diffstat (limited to 'mesonbuild/backend/vs2010backend.py')
-rw-r--r-- | mesonbuild/backend/vs2010backend.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index ea02580..e872a04 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -429,9 +429,12 @@ class Vs2010Backend(backends.Backend): # Always use a wrapper because MSBuild eats random characters when # there are many arguments. tdir_abs = os.path.join(self.environment.get_build_dir(), self.get_target_dir(target)) + extra_bdeps = target.get_transitive_build_target_deps() + extra_paths = self.determine_windows_extra_paths(target.command[0], extra_bdeps) exe_data = self.serialize_executable(target.command[0], cmd[1:], # All targets run from the target dir tdir_abs, + extra_paths=extra_paths, capture=ofilenames[0] if target.capture else None) wrapper_cmd = self.environment.get_build_command() + ['--internal', 'exe', exe_data] ET.SubElement(customstep, 'Command').text = ' '.join(self.quote_arguments(wrapper_cmd)) |