diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-15 04:12:26 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2016-10-19 20:42:11 +0530 |
| commit | 419b84784f2051981e1c24e33256de972a8e3485 (patch) | |
| tree | f2b665f11aa8cabcae159c3250364bd89a0344a8 /mesonbuild/backend/vs2010backend.py | |
| parent | c4fabc8ecf96573b3204fc21927de64240edf19d (diff) | |
| download | meson-419b84784f2051981e1c24e33256de972a8e3485.zip meson-419b84784f2051981e1c24e33256de972a8e3485.tar.gz meson-419b84784f2051981e1c24e33256de972a8e3485.tar.bz2 | |
CustomTarget: Use get_outputs() instead of get_filename()
get_filename() made no sense for CustomTarget since it can have multiple
outputs. Also use get_outputs() for GeneratedList since it has the same
meaning and remove unused set_generated().
As a side-effect, we now install all the outputs of a CustomTarget.
Diffstat (limited to 'mesonbuild/backend/vs2010backend.py')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index eca7473..f1d949a 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -102,7 +102,7 @@ class Vs2010Backend(backends.Backend): down = self.target_to_build_root(target) for genlist in target.get_generated_sources(): if isinstance(genlist, build.CustomTarget): - for i in genlist.output: + for i in genlist.get_outputs(): # Path to the generated source from the current vcxproj dir via the build root ipath = os.path.join(down, self.get_target_dir(genlist), i) custom_target_output_files.append(ipath) @@ -112,8 +112,8 @@ class Vs2010Backend(backends.Backend): else: generator = genlist.get_generator() exe = generator.get_exe() - infilelist = genlist.get_infilelist() - outfilelist = genlist.get_outfilelist() + infilelist = genlist.get_inputs() + outfilelist = genlist.get_outputs() exe_arr = self.exe_object_to_cmd_array(exe) base_args = generator.get_arglist() for i in range(len(infilelist)): |