| Index: testing/SConscript.gtest
|
| ===================================================================
|
| --- testing/SConscript.gtest (revision 7290)
|
| +++ testing/SConscript.gtest (working copy)
|
| @@ -1,35 +1,37 @@
|
| -# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
|
| -# Use of this source code is governed by a BSD-style license that can be
|
| -# found in the LICENSE file.
|
| -
|
| -Import('env')
|
| -
|
| -env = env.Clone()
|
| -
|
| -env.Prepend(
|
| - CPPPATH = [
|
| - '$GTEST_DIR',
|
| - '$GTEST_DIR/include',
|
| - ],
|
| -)
|
| -
|
| -if env.Bit('windows'):
|
| - env.Append(
|
| - CCFLAGS = [
|
| - '/TP',
|
| -
|
| - '/WX',
|
| - '/Wp64',
|
| - ],
|
| - )
|
| -
|
| -input_files = [
|
| - 'gtest/src/gtest-death-test.cc',
|
| - 'gtest/src/gtest-filepath.cc',
|
| - 'gtest/src/gtest-port.cc',
|
| - 'gtest/src/gtest.cc',
|
| - 'multiprocess_func_list.cc',
|
| -]
|
| -
|
| -env.ChromeStaticLibrary('gtest', input_files)
|
| -
|
| +# Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
|
| +# Use of this source code is governed by a BSD-style license that can be
|
| +# found in the LICENSE file.
|
| +
|
| +Import('env')
|
| +
|
| +env = env.Clone()
|
| +
|
| +env.Prepend(
|
| + CPPPATH = [
|
| + '$GTEST_DIR',
|
| + '$GTEST_DIR/include',
|
| + ],
|
| +)
|
| +
|
| +if env.Bit('windows'):
|
| + env.Append(
|
| + CCFLAGS = [
|
| + '/TP',
|
| +
|
| + '/WX',
|
| + '/Wp64',
|
| + ],
|
| + )
|
| +
|
| +input_files = [
|
| + 'gtest/src/gtest-death-test.cc',
|
| + 'gtest/src/gtest-filepath.cc',
|
| + 'gtest/src/gtest-port.cc',
|
| + 'gtest/src/gtest.cc',
|
| + 'multiprocess_func_list.cc',
|
| +]
|
| +
|
| +env.ChromeStaticLibrary('gtest', input_files)
|
| +
|
| +env.ChromeMSVSProject('$TESTING_DIR/gtest.vcproj',
|
| + guid='{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}')
|
|
|