From 202a4c37ee88e47c614a61db5fe0f134f9f6ea1a Mon Sep 17 00:00:00 2001
From: Giacomo Travaglini <giacomo.travaglini@arm.com>
Date: Mon, 3 Dec 2018 11:37:51 +0000
Subject: ext: Build googlemock with googletest
googlemock needs to be built together with googletest. This patch
is enabling it by doing the following things
* Moving googletest and googlemock under the same top level directory,
so that we have a single SConscript for building them.
This also matches googletest directory structure:
googletest
|_googletest
|_googlemock
* Adding a shared SConscript which is building gmock and gtest as libgtest
* Removing googletest/SConscript
Change-Id: I88accbdd2e80fb47efaa17819233371fbad6acaa
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/14696
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Gabe Black <gabeblack@google.com>
---
ext/googletest/xcode/Config/DebugProject.xcconfig | 30 -----------------------
1 file changed, 30 deletions(-)
delete mode 100644 ext/googletest/xcode/Config/DebugProject.xcconfig
(limited to 'ext/googletest/xcode/Config/DebugProject.xcconfig')
diff --git a/ext/googletest/xcode/Config/DebugProject.xcconfig b/ext/googletest/xcode/Config/DebugProject.xcconfig
deleted file mode 100644
index 3d68157d5..000000000
--- a/ext/googletest/xcode/Config/DebugProject.xcconfig
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// DebugProject.xcconfig
-//
-// These are Debug Configuration project settings for the gtest framework and
-// examples. It is set in the "Based On:" dropdown in the "Project" info
-// dialog.
-// This file is based on the Xcode Configuration files in:
-// http://code.google.com/p/google-toolbox-for-mac/
-//
-
-#include "General.xcconfig"
-
-// No optimization
-GCC_OPTIMIZATION_LEVEL = 0
-
-// Deployment postprocessing is what triggers Xcode to strip, turn it off
-DEPLOYMENT_POSTPROCESSING = NO
-
-// Dead code stripping off
-DEAD_CODE_STRIPPING = NO
-
-// Debug symbols should be on obviously
-GCC_GENERATE_DEBUGGING_SYMBOLS = YES
-
-// Define the DEBUG macro in all debug builds
-OTHER_CFLAGS = $(OTHER_CFLAGS) -DDEBUG=1
-
-// These are turned off to avoid STL incompatibilities with client code
-// // Turns on special C++ STL checks to "encourage" good STL use
-// GCC_PREPROCESSOR_DEFINITIONS = $(GCC_PREPROCESSOR_DEFINITIONS) _GLIBCXX_DEBUG_PEDANTIC _GLIBCXX_DEBUG _GLIBCPP_CONCEPT_CHECKS
--
cgit v1.2.3