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>

1 files changed, 0 insertions, 88 deletions

diff --git a/ext/googletest/codegear/gtest_unittest.cbproj b/ext/googletest/codegear/gtest_unittest.cbproj
deleted file mode 100644
index dc5db8e4d..000000000
--- a/ext/googletest/codegear/gtest_unittest.cbproj
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <ProjectGuid>{eea63393-5ac5-4b9c-8909-d75fef2daa41}</ProjectGuid>

-    <Config Condition="'$(Config)'==''">Release</Config>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

-    <Base>true</Base>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">

-    <Base>true</Base>

-    <Cfg_1>true</Cfg_1>

-    <CfgParent>Base</CfgParent>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">

-    <Base>true</Base>

-    <Cfg_2>true</Cfg_2>

-    <CfgParent>Base</CfgParent>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Base)'!=''">

-    <OutputExt>exe</OutputExt>

-    <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>

-    <Defines>NO_STRICT</Defines>

-    <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>

-    <DynamicRTL>true</DynamicRTL>

-    <ILINK_ObjectSearchPath>..\test</ILINK_ObjectSearchPath>

-    <UsePackages>true</UsePackages>

-    <ProjectType>CppConsoleApplication</ProjectType>

-    <NoVCL>true</NoVCL>

-    <BCC_CPPCompileAlways>true</BCC_CPPCompileAlways>

-    <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi</PackageImports>

-    <BCC_wpar>false</BCC_wpar>

-    <IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..</IncludePath>

-    <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</ILINK_LibraryPath>

-    <Multithreaded>true</Multithreaded>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Cfg_1)'!=''">

-    <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>

-    <DCC_Optimize>false</DCC_Optimize>

-    <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>

-    <Defines>_DEBUG;$(Defines)</Defines>

-    <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>

-    <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>

-    <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>

-    <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>

-    <DCC_Define>DEBUG</DCC_Define>

-    <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>

-    <IntermediateOutputDir>Debug</IntermediateOutputDir>

-    <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>

-    <BCC_StackFrames>true</BCC_StackFrames>

-    <BCC_DisableOptimizations>true</BCC_DisableOptimizations>

-    <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>

-    <TASM_Debugging>Full</TASM_Debugging>

-    <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>

-  </PropertyGroup>

-  <PropertyGroup Condition="'$(Cfg_2)'!=''">

-    <Defines>NDEBUG;$(Defines)</Defines>

-    <IntermediateOutputDir>Release</IntermediateOutputDir>

-    <ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath)</ILINK_LibraryPath>

-    <TASM_Debugging>None</TASM_Debugging>

-  </PropertyGroup>

-  <ProjectExtensions>

-    <Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>

-    <Borland.ProjectType>CppConsoleApplication</Borland.ProjectType>

-    <BorlandProject>

-<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams"></Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD"></Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Excluded_Packages>

-      

-      

-      <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>

-      <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>

-    </Excluded_Packages><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item1">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item2">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(OUTPUTDIR);..\test</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">2</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item1">STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>

-  </ProjectExtensions>

-  <Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />

-  <ItemGroup>

-    <CppCompile Include="..\test\gtest_unittest.cc">

-      <BuildOrder>0</BuildOrder>

-    </CppCompile>

-    <CppCompile Include="gtest_link.cc">

-      <BuildOrder>1</BuildOrder>

-    </CppCompile>

-    <BuildConfiguration Include="Debug">

-      <Key>Cfg_1</Key>

-    </BuildConfiguration>

-    <BuildConfiguration Include="Release">

-      <Key>Cfg_2</Key>

-    </BuildConfiguration>

-  </ItemGroup>

-</Project>
\ No newline at end of file