From 2617eddf316a50032775c438d165f64eb557cc0d 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. --- configure | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index b58f30c..74e995a 100755 --- a/configure +++ b/configure @@ -84,7 +84,10 @@ class Configuration(Cxx, Install, ConfigHash, Templates): def vars(self): super(Configuration, self).vars() - self.add_option('GTEST_DIR', init='/usr/src/gtest', + #self.add_option('GTEST_DIR', init='/usr/src/gtest', + # gtest>1.8.1 requires C++11+, while TMWA is currentl C++0x only. + # Modern distros ship gtest-1.14, which requires C++14+ + 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) -- cgit v1.2.3-70-g09d2