aboutsummaryrefslogtreecommitdiffhomepage
path: root/gyp
diff options
context:
space:
mode:
authorGravatar bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-15 14:31:29 +0000
committerGravatar bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-10-15 14:31:29 +0000
commitb3e77940a6d97ddcde0c16e68c44597f967ca2db (patch)
treeb8ca327d1ee54ea0d8f0affd0d4a9ffcc04e7f5f /gyp
parent858804dfe62c957050080a6fdce9226387ae7b7d (diff)
Generate debugger mocs into out instead of src.
Diffstat (limited to 'gyp')
-rw-r--r--gyp/debugger.gyp17
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.',
},
],