From 092281517310d890ff99cc957c7d21fce774d082 Mon Sep 17 00:00:00 2001 From: "xians@google.com" Date: Mon, 8 Aug 2011 11:44:07 +0000 Subject: [PATCH] exclude the test target from building with chromium. Review URL: http://webrtc-codereview.appspot.com/93016 git-svn-id: http://webrtc.googlecode.com/svn/trunk@321 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../video_render/main/source/video_render.gyp | 91 ++++++++++--------- 1 file changed, 49 insertions(+), 42 deletions(-) diff --git a/src/modules/video_render/main/source/video_render.gyp b/src/modules/video_render/main/source/video_render.gyp index 89287d755a..c8ad9188a9 100644 --- a/src/modules/video_render/main/source/video_render.gyp +++ b/src/modules/video_render/main/source/video_render.gyp @@ -125,49 +125,56 @@ }], ] # conditions }, # video_render_module - { - 'target_name': 'video_render_module_test', - 'type': 'executable', - 'dependencies': [ - 'video_render_module', - '../../../utility/source/utility.gyp:webrtc_utility', - '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', - '../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib', - ], - 'include_dirs': [ - ], - 'sources': [ - # sources - '../test/testAPI/testAPI.cpp', - ], # source - 'conditions': [ - # DEFINE PLATFORM SPECIFIC INCLUDE AND CFLAGS - ['OS=="mac" or OS=="linux"', { - 'cflags': [ - '-Wno-write-strings', - ], - 'ldflags': [ - '-lpthread -lm', - ], - }], - ['OS=="linux"', { - 'libraries': [ - '-lrt', - '-lXext', - '-lX11', - ], - }], - ['OS=="mac"', { - 'xcode_settings': { - 'OTHER_CPLUSPLUSFLAGS': '-x objective-c++', - 'OTHER_LDFLAGS': [ - '-framework Foundation -framework AppKit -framework Cocoa -framework OpenGL', - ], - }, - }], - ] # conditions - }, # video_render_module_test ], # targets + # Exclude the test target when building with chromium. + 'conditions': [ + ['build_with_chromium==0', { + 'targets': [ + { + 'target_name': 'video_render_module_test', + 'type': 'executable', + 'dependencies': [ + 'video_render_module', + '../../../utility/source/utility.gyp:webrtc_utility', + '../../../../system_wrappers/source/system_wrappers.gyp:system_wrappers', + '../../../../common_video/vplib/main/source/vplib.gyp:webrtc_vplib', + ], + 'include_dirs': [ + ], + 'sources': [ + # sources + '../test/testAPI/testAPI.cpp', + ], # source + 'conditions': [ + # DEFINE PLATFORM SPECIFIC INCLUDE AND CFLAGS + ['OS=="mac" or OS=="linux"', { + 'cflags': [ + '-Wno-write-strings', + ], + 'ldflags': [ + '-lpthread -lm', + ], + }], + ['OS=="linux"', { + 'libraries': [ + '-lrt', + '-lXext', + '-lX11', + ], + }], + ['OS=="mac"', { + 'xcode_settings': { + 'OTHER_CPLUSPLUSFLAGS': '-x objective-c++', + 'OTHER_LDFLAGS': [ + '-framework Foundation -framework AppKit -framework Cocoa -framework OpenGL', + ], + }, + }], + ] # conditions + }, # video_render_module_test + ], # targets + }], # build_with_chromium==0 + ], # conditions } # Local Variables: