Add googletest-1.8.1 as a submodule - gtest-1.14 shipped by my distro requires C++14.

3 files changed, 10 insertions, 1 deletions

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
+Subproject 2fe3bd994b3189899d93f1d5a881e725e046fdc