Skip to content

Commit

Permalink
Revert 260949 "Move gtest/gmock BUILD.gn files to main tree."
Browse files Browse the repository at this point in the history
> Move gtest/gmock BUILD.gn files to main tree.
> 
> Also moves the "unused variable warning" to a config in the build directory so
> it can be shared with outher targets without duplication on the command line.
> 
> BUG=
> R=cjhopman@chromium.org
> 
> Review URL: https://codereview.chromium.org/219433005

TBR=brettw@chromium.org

Review URL: https://codereview.chromium.org/218493017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260954 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
brettw@chromium.org committed Apr 1, 2014
1 parent 97c98dc commit 7219261
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 18 deletions.
8 changes: 0 additions & 8 deletions build/config/win/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,3 @@ config("incremental_linking") {
config("no_incremental_linking") {
ldflags = [ "/INCREMENTAL:NO" ]
}

# Disable unused variable warning ----------------------------------------------

# Sometimes third-party code wants to disable this warning under MSVC, so this
# config makes it easy to do so.
config("disable_unused_variable_warning") {
cflags = [ "/wd4800" ]
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ static_library("gmock") {
":gmock_config",
"//testing/gtest:gtest_config",
]
if (is_win) {
all_dependent_configs += [
"//build/config/win:disable_unused_variable_warning",
]
}
}

static_library("gmock_main") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ config("gtest_config") {
# Gtest headers need to be able to find themselves.
include_dirs = [ "include" ]

if (is_win) {
cflags = [ "/wd4800" ] # Unused variable warning.
}

if (is_posix) {
defines += [
# gtest isn't able to figure out when RTTI is disabled for gcc
Expand Down Expand Up @@ -74,11 +78,6 @@ static_library("gtest") {
include_dirs = [ "." ]

all_dependent_configs = [ ":gtest_config" ]
if (is_win) {
all_dependent_configs += [
"//build/config/win:disable_unused_variable_warning",
]
}

configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
Expand Down

0 comments on commit 7219261

Please sign in to comment.