From cc086e08c128763762b3fa67c6d2771b88d84d9d Mon Sep 17 00:00:00 2001 From: Fedja Beader Date: Sun, 10 Dec 2023 22:10:58 +0100 Subject: Add googletest-1.8.1 as a submodule - gtest-1.14 shipped by my distro requires C++14. --- .gitmodules | 3 +++ configure | 8 +++++++- deps/googletest | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) create mode 160000 deps/googletest diff --git a/.gitmodules b/.gitmodules index 931035d..8197e60 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "deps/attoconf"] path = deps/attoconf url = https://github.com/o11c/attoconf.git +[submodule "deps/googletest"] + path = deps/googletest + url = https://github.com/google/googletest.git diff --git a/configure b/configure index 67bcf53..aa1d0fd 100755 --- a/configure +++ b/configure @@ -84,7 +84,13 @@ class Configuration(Cxx, Install, ConfigHash, Templates): def vars(self): super(Configuration, self).vars() - self.add_option('GTEST_DIR', init='/usr/src/gtest', + # Why submodule gtest? + # 1) make test requires gtest-all.cc. This file is shipped by Ubuntu, + # but not by Gentoo; + # 2) Modern distros ship gtest-1.13+. It requires C++14+, while + # TMWA is currently a C++0x codebase. + self.add_option('GTEST_DIR', + init=os.path.join(os.getcwd(), 'deps/googletest/googletest'), # http://code.google.com/p/googletest/wiki/FAQ#Why_is_it_not_recommended_to_install_a_pre-compiled_copy_of_Goog type=filepath, check=lambda build, GTEST_DIR: None, help='Location of Google Test sources, must contain src/gtest-all.cc (linking to a precompiled library is NOT supported)', hidden=False) diff --git a/deps/googletest b/deps/googletest new file mode 160000 index 0000000..2fe3bd9 --- /dev/null +++ b/deps/googletest @@ -0,0 +1 @@ +Subproject commit 2fe3bd994b3189899d93f1d5a881e725e046fdc2 -- cgit v1.2.3-60-g2f50