Strip down Scons build of googletest and googlemock

2 files changed, 2 insertions, 31 deletions

diff --git a/lib/googletest-1.8.x/googlemock/SConscript b/lib/googletest-1.8.x/googlemock/SConscript
index f9a6db8ed9..36bd9610e8 100644
--- a/lib/googletest-1.8.x/googlemock/SConscript
+++ b/lib/googletest-1.8.x/googlemock/SConscript
@@ -6,14 +6,7 @@ env.Prepend(CPPPATH = ['.', '../include'])
 
 # Sources used by base library and library that includes main.
 gmock_source = 'src/gmock-all.cc'
-gmock_main_source = 'src/gmock_main.cc'
 
 # gmock.lib to be used by most apps (if you have your own main
 # function)
-gmock = env.StaticLibrary(target='gmock',
-                          source=[gmock_source])
-
-# gmock_main.lib can be used if you just want a basic main function;
-# it is also used by the tests for Google Test itself.
-gmock_main = env.StaticLibrary(target='gmock_main',
-                               source=[gmock_source, gmock_main_source])
+gmock = env.StaticLibrary(target='gmock', source=gmock_source)
diff --git a/lib/googletest-1.8.x/googletest/SConscript b/lib/googletest-1.8.x/googletest/SConscript
index 588fe1e63a..82f1a60f0f 100644
--- a/lib/googletest-1.8.x/googletest/SConscript
+++ b/lib/googletest-1.8.x/googletest/SConscript
@@ -6,29 +6,7 @@ env.Prepend(CPPPATH = ['.', '../include'])
 
 # Sources used by base library and library that includes main.
 gtest_source = 'src/gtest-all.cc'
-gtest_main_source = 'src/gtest_main.cc'
 
 # gtest.lib to be used by most apps (if you have your own main
 # function)
-gtest = env.StaticLibrary(target='gtest',
-                          source=[gtest_source])
-
-# gtest_main.lib can be used if you just want a basic main function;
-# it is also used by the tests for Google Test itself.
-gtest_main = env.StaticLibrary(target='gtest_main',
-                               source=[gtest_source, gtest_main_source])
-
-env_with_exceptions = env.Clone()
-platform = env_with_exceptions['PLATFORM']
-if platform == 'win32':
-  env_with_exceptions.Append(CCFLAGS = ['/EHsc'])
-  env_with_exceptions.Append(CPPDEFINES = '_HAS_EXCEPTIONS=1')
-
-gtest_ex_obj = env_with_exceptions.Object(target='gtest_ex',
-                                          source=gtest_source)
-gtest_main_ex_obj = env_with_exceptions.Object(target='gtest_main_ex',
-                                               source=gtest_main_source)
-
-gtest_ex_main = env_with_exceptions.StaticLibrary(
-    target='gtest_ex_main',
-    source=gtest_ex_obj + gtest_main_ex_obj)
+gtest = env.StaticLibrary(target='gtest', source=gtest_source)