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

Side by Side Diff: testing/SConscript.gtest

Issue 17212: Update googletest (gtest) to 1.2.1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 11 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 Import('env') 5 Import('env')
6 6
7 env = env.Clone() 7 env = env.Clone()
8 8
9 env.Prepend( 9 env.Prepend(
10 CPPPATH = [ 10 CPPPATH = [
(...skipping 22 matching lines...) Expand all
33 'gtest/include/gtest/internal/gtest-internal.h', 33 'gtest/include/gtest/internal/gtest-internal.h',
34 'gtest/include/gtest/gtest-message.h', 34 'gtest/include/gtest/gtest-message.h',
35 'gtest/src/gtest-port.cc', 35 'gtest/src/gtest-port.cc',
36 'gtest/include/gtest/internal/gtest-port.h', 36 'gtest/include/gtest/internal/gtest-port.h',
37 'gtest/include/gtest/gtest-spi.h', 37 'gtest/include/gtest/gtest-spi.h',
38 'gtest/include/gtest/internal/gtest-string.h', 38 'gtest/include/gtest/internal/gtest-string.h',
39 'gtest/src/gtest.cc', 39 'gtest/src/gtest.cc',
40 'gtest/include/gtest/gtest.h', 40 'gtest/include/gtest/gtest.h',
41 'gtest/include/gtest/gtest_pred_impl.h', 41 'gtest/include/gtest/gtest_pred_impl.h',
42 'gtest/include/gtest/gtest_prod.h', 42 'gtest/include/gtest/gtest_prod.h',
43 'gtest/src/gtest-test-part.cc',
43 'multiprocess_func_list.cc', 44 'multiprocess_func_list.cc',
44 ]) 45 ])
45 46
46 env.ChromeLibrary('gtest', input_files) 47 env.ChromeLibrary('gtest', input_files)
47 48
48 p = env.ChromeMSVSProject('gtest.vcproj', 49 p = env.ChromeMSVSProject('gtest.vcproj',
49 guid='{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}', 50 guid='{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}',
50 files=input_files, 51 files=input_files,
51 tools = [ 52 tools = [
52 'VCPreBuildEventTool', 53 'VCPreBuildEventTool',
(...skipping 25 matching lines...) Expand all
78 InheritedPropertySheets = [ 79 InheritedPropertySheets = [
79 '$(SolutionDir)../build/release.vsprops', 80 '$(SolutionDir)../build/release.vsprops',
80 './using_gtest.vsprops', 81 './using_gtest.vsprops',
81 ]) 82 ])
82 83
83 env.AlwaysBuild(p) 84 env.AlwaysBuild(p)
84 85
85 i = env.Command('$CHROME_SRC_DIR/testing/gtest.vcproj', p, 86 i = env.Command('$CHROME_SRC_DIR/testing/gtest.vcproj', p,
86 Copy('$TARGET', '$SOURCE')) 87 Copy('$TARGET', '$SOURCE'))
87 Alias('msvs', i) 88 Alias('msvs', i)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698