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/SConscript | |
| 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/SConscript')
| -rw-r--r-- | ext/googletest/SConscript | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/ext/googletest/SConscript b/ext/googletest/SConscript index 27013f265..6792a756c 100644 --- a/ext/googletest/SConscript +++ b/ext/googletest/SConscript @@ -1,5 +1,8 @@ # Copyright 2017 Google Inc. # +# Copyright (c) 2018 ARM Limited +# All rights reserved. +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: redistributions of source code must retain the above copyright @@ -28,22 +31,26 @@ Import('main') # The root of the build directory. build = Dir('.') # The root of the original directory. -base = build.srcdir +gtest_base = build.srcdir.Dir('googletest') +gmock_base = build.srcdir.Dir('googlemock') # Include files from the original directory. -include = base.Dir('include') +gtest_include = gtest_base.Dir('include') +gmock_include = gmock_base.Dir('include') # Use source files from the build directory so build products end up there. -src = Dir('src') +gtest_src = Dir('googletest/src') +gmock_src = Dir('googlemock/src') -main.Append(CPPPATH=[include]) +main.Append(CPPPATH=[gtest_include, gmock_include]) main.Append(LIBPATH=[build]) env = main.Clone(CPPFLAGS='-g -Wall -Wextra -pthread' - ' -Wno-undef -isystem %s' % include) -env.Append(CPPPATH=[base]) + ' -Wno-undef -isystem %s -isystem %s' % (gtest_include, gmock_include)) +env.Append(CPPPATH=[gtest_base, gmock_base]) -gtest_all = env.Object(src.File('gtest-all.cc')) +gtest_all = env.Object(gtest_src.File('gtest-all.cc')) +gmock_all = env.Object(gmock_src.File('gmock-all.cc')) gtest_main = env.StaticLibrary( - target='gtest_main', source=[gtest_all, src.File('gtest_main.cc')]) + target='libgtest', source=[gtest_all, gmock_all, gtest_src.File('gtest_main.cc')]) -main['GTEST_LIBS'] = ['gtest_main', 'pthread'] -main['GTEST_CPPFLAGS'] = '-pthread -Wno-undef -isystem %s' % include.abspath +main['GTEST_LIBS'] = ['libgtest', 'pthread'] +main['GTEST_CPPFLAGS'] = '-pthread -DUSE_GMOCK -Wno-undef -isystem %s' % gtest_include.abspath |