diff options
| author | Nicolas Schneider <nioncode+git@gmail.com> | 2017-03-20 13:12:53 +0100 |
|---|---|---|
| committer | Nicolas Schneider <nioncode+git@gmail.com> | 2017-03-20 14:33:44 +0100 |
| commit | baa6df2ce73877747c6327a0850a3eaa00e69f5f (patch) | |
| tree | 8b311e7f9462d352c2254970d6fdf0d65b24ca22 | |
| parent | b3073aa1ca0a6487261645ab44bee79229cf7265 (diff) | |
| download | meson-baa6df2ce73877747c6327a0850a3eaa00e69f5f.zip meson-baa6df2ce73877747c6327a0850a3eaa00e69f5f.tar.gz meson-baa6df2ce73877747c6327a0850a3eaa00e69f5f.tar.bz2 | |
vs: do not add generated objects to project
VS2015 automatically picks up outputs from CustomBuild commands, which we
now use instead of CustomBuildStep commands, which do not get picked up
automatically.
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 8 | ||||
| -rw-r--r-- | mesonbuild/backend/vs2015backend.py | 11 |
2 files changed, 4 insertions, 15 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index e34712a..e1f7325 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -457,14 +457,14 @@ class Vs2010Backend(backends.Backend): @staticmethod def has_objects(objects, additional_objects, generated_objects): - # Ignore generated objects, those are automatically used by MSBuild for VS2010, because they are part of - # the CustomBuildStep Outputs. + # Ignore generated objects, those are automatically used by MSBuild because they are part of + # the CustomBuild Outputs. return len(objects) + len(additional_objects) > 0 @staticmethod def add_generated_objects(node, generated_objects): - # Do not add generated objects to project file. Those are automatically used by MSBuild for VS2010, because - # they are part of the CustomBuildStep Outputs. + # Do not add generated objects to project file. Those are automatically used by MSBuild, because + # they are part of the CustomBuild Outputs. return @staticmethod diff --git a/mesonbuild/backend/vs2015backend.py b/mesonbuild/backend/vs2015backend.py index 2c0efa7..b8e3504 100644 --- a/mesonbuild/backend/vs2015backend.py +++ b/mesonbuild/backend/vs2015backend.py @@ -23,14 +23,3 @@ class Vs2015Backend(Vs2010Backend): self.platform_toolset = 'v140' self.vs_version = '2015' - @staticmethod - def has_objects(objects, additional_objects, generated_objects): - # VS2015 requires generated objects to be added explicitly to the project file. - return len(objects) + len(additional_objects) + len(generated_objects) > 0 - - @staticmethod - def add_generated_objects(node, generated_objects): - # VS2015 requires generated objects to be added explicitly to the project file. - for s in generated_objects: - ET.SubElement(node, 'Object', Include=s) - return |