diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 09:01:38 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-22 09:01:38 +0000 |
| commit | b54b7c6c5670bb39e03c0079066477b4a2872828 (patch) | |
| tree | 52b4dd7e48ed57da6cd326cf15a8cb4522042807 /third_party/isimpledom | |
| parent | e3bbe9e6831b3cfac7f1ac8cee8d88dda4cf5ff6 (diff) | |
| download | chromium_src-b54b7c6c5670bb39e03c0079066477b4a2872828.zip chromium_src-b54b7c6c5670bb39e03c0079066477b4a2872828.tar.gz chromium_src-b54b7c6c5670bb39e03c0079066477b4a2872828.tar.bz2 | |
Make isimpledom write shared generated files to SHARED_INTERMEDIATE_DIR
BUG=97186
TEST=none
Review URL: http://codereview.chromium.org/7973006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/isimpledom')
| -rw-r--r-- | third_party/isimpledom/isimpledom.gyp | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/third_party/isimpledom/isimpledom.gyp b/third_party/isimpledom/isimpledom.gyp index 61ba162..80a0089 100644 --- a/third_party/isimpledom/isimpledom.gyp +++ b/third_party/isimpledom/isimpledom.gyp @@ -3,41 +3,34 @@ # found in the LICENSE file. { - 'includes': [ - '../../build/common.gypi', - ], - - 'target_defaults': { - 'include_dirs': [ - '.', - '<(INTERMEDIATE_DIR)', - ], - }, 'targets': [ { 'target_name': 'isimpledom', 'type': 'static_library', + 'variables': { + 'midl_out_dir': '<(SHARED_INTERMEDIATE_DIR)/third_party/isimpledom', + }, 'sources': [ 'ISimpleDOMDocument.idl', 'ISimpleDOMNode.idl', 'ISimpleDOMText.idl', - '<(INTERMEDIATE_DIR)/ISimpleDOMDocument.h', - '<(INTERMEDIATE_DIR)/ISimpleDOMDocument_i.c', - '<(INTERMEDIATE_DIR)/ISimpleDOMNode.h', - '<(INTERMEDIATE_DIR)/ISimpleDOMNode_i.c', - '<(INTERMEDIATE_DIR)/ISimpleDOMText.h', - '<(INTERMEDIATE_DIR)/ISimpleDOMText_i.c', + '<(midl_out_dir)/ISimpleDOMDocument.h', + '<(midl_out_dir)/ISimpleDOMDocument_i.c', + '<(midl_out_dir)/ISimpleDOMNode.h', + '<(midl_out_dir)/ISimpleDOMNode_i.c', + '<(midl_out_dir)/ISimpleDOMText.h', + '<(midl_out_dir)/ISimpleDOMText_i.c', ], 'hard_dependency': 1, 'direct_dependent_settings': { 'include_dirs': [ - # Bit of a hack to work around the built in vstudio rule. - '<(INTERMEDIATE_DIR)/../isimpledom', + '<(SHARED_INTERMEDIATE_DIR)', ], }, 'msvs_settings': { 'VCMIDLTool': { 'GenerateTypeLibrary': 'false', + 'OutputDirectory': '<(midl_out_dir)', }, }, }, |