diff options
| author |  bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-15 14:31:29 +0000 |
|---|---|---|
| committer | bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-10-15 14:31:29 +0000 |
| commit | b3e77940a6d97ddcde0c16e68c44597f967ca2db (patch) | |
| tree | b8ca327d1ee54ea0d8f0affd0d4a9ffcc04e7f5f | |
| parent | 858804dfe62c957050080a6fdce9226387ae7b7d (diff) | |
Generate debugger mocs into out instead of src.
https://codereview.appspot.com/6674044/
git-svn-id: http://skia.googlecode.com/svn/trunk@5953 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | gyp/debugger.gyp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp index d64050f647..35782237f6 100644 --- a/gyp/debugger.gyp +++ b/gyp/debugger.gyp @@ -66,6 +66,7 @@ }], ], 'moc_src_dir': '../debugger/QT', + 'moc_gen_dir': '<(SHARED_INTERMEDIATE_DIR)/debugger/QT', }, 'targets': [ { @@ -110,12 +111,12 @@ '../debugger/QT/qrc_SkIcons.cpp', # Generated MOC files - '<(moc_src_dir)/moc_SkCanvasWidget.cpp', - '<(moc_src_dir)/moc_SkDebuggerGUI.cpp', - '<(moc_src_dir)/moc_SkInspectorWidget.cpp', - '<(moc_src_dir)/moc_SkSettingsWidget.cpp', - '<(moc_src_dir)/moc_SkRasterWidget.cpp', - '<(moc_src_dir)/moc_SkGLWidget.cpp', + '<(moc_gen_dir)/moc_SkCanvasWidget.cpp', + '<(moc_gen_dir)/moc_SkDebuggerGUI.cpp', + '<(moc_gen_dir)/moc_SkInspectorWidget.cpp', + '<(moc_gen_dir)/moc_SkSettingsWidget.cpp', + '<(moc_gen_dir)/moc_SkRasterWidget.cpp', + '<(moc_gen_dir)/moc_SkGLWidget.cpp', ], 'dependencies': [ 'skia_base_libs.gyp:skia_base_libs', @@ -144,8 +145,8 @@ { 'rule_name': 'generate_moc', 'extension': 'h', - 'outputs': [ '<(RULE_INPUT_DIRNAME)/moc_<(RULE_INPUT_ROOT).cpp' ], - 'action': [ '<(qt_moc)', '<(RULE_INPUT_PATH)', '-o', '<(moc_src_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], + 'outputs': [ '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], + 'action': [ '<(qt_moc)', '<(RULE_INPUT_PATH)', '-o', '<(moc_gen_dir)/moc_<(RULE_INPUT_ROOT).cpp' ], 'message': 'Generating <(RULE_INPUT_ROOT).cpp.', }, ], |