Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(295)

Unified Diff: pylib/gyp/msvs_emulation.py

Issue 602073003: Add support for MIDL include directories (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « pylib/gyp/generator/ninja.py ('k') | test/win/gyptest-midl-includedirs.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pylib/gyp/msvs_emulation.py
diff --git a/pylib/gyp/msvs_emulation.py b/pylib/gyp/msvs_emulation.py
index 56e5ffbda3a54bfe797a9b4cb95a861bfac4573f..6343de93733015db77dc398538238fd2d85037e7 100644
--- a/pylib/gyp/msvs_emulation.py
+++ b/pylib/gyp/msvs_emulation.py
@@ -318,6 +318,14 @@ class MsvsSettings(object):
('VCCLCompilerTool', 'AdditionalIncludeDirectories'), config, default=[]))
return [self.ConvertVSMacros(p, config=config) for p in includes]
+ def AdjustMidlIncludeDirs(self, midl_include_dirs, config):
+ """Updates midl_include_dirs to expand VS specific paths, and adds any
+ AdditionalIncludeDirectories specified in VCMIDLTool."""
+ config = self._TargetConfig(config)
+ includes = midl_include_dirs + self._Setting(
scottmg 2014/09/25 17:17:50 similiarly here the same as above
+ ('VCMIDLTool', 'AdditionalIncludeDirectories'), config, default=[])
+ return [self.ConvertVSMacros(p, config=config) for p in includes]
+
def GetComputedDefines(self, config):
"""Returns the set of defines that are injected to the defines list based
on other VS settings."""
« no previous file with comments | « pylib/gyp/generator/ninja.py ('k') | test/win/gyptest-midl-includedirs.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698