diff options
| author | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-12-03 11:37:51 +0000 |
|---|---|---|
| committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-12-06 11:52:57 +0000 |
| commit | 202a4c37ee88e47c614a61db5fe0f134f9f6ea1a (patch) | |
| tree | 204540a1eb55ea0f2d7cdf28139530c337b62326 /ext/googletest/googlemock/msvc/2005/gmock_config.vsprops | |
| parent | 44551545affd785804a3dde8f0e88b3bcf9bf904 (diff) | |
| download | gem5-202a4c37ee88e47c614a61db5fe0f134f9f6ea1a.tar.xz | |
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>
Diffstat (limited to 'ext/googletest/googlemock/msvc/2005/gmock_config.vsprops')
| -rw-r--r-- | ext/googletest/googlemock/msvc/2005/gmock_config.vsprops | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/ext/googletest/googlemock/msvc/2005/gmock_config.vsprops b/ext/googletest/googlemock/msvc/2005/gmock_config.vsprops new file mode 100644 index 000000000..9b5ff7f38 --- /dev/null +++ b/ext/googletest/googlemock/msvc/2005/gmock_config.vsprops @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="gmock_config" + > + <Tool + Name="VCCLCompilerTool" + AdditionalIncludeDirectories=""$(GTestDir)/include"" + /> + <UserMacro + Name="GTestDir" + Value="../../../googletest" + /> +</VisualStudioPropertySheet> |