summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorFedja Beader <fedja@protonmail.ch>2023-12-10 22:10:58 +0100
committerFedja Beader <fedja@protonmail.ch>2023-12-10 22:10:58 +0100
commit2617eddf316a50032775c438d165f64eb557cc0d (patch)
treead1e73af9eced11b2904c38ebb4adfa9d4000a49 /configure
parent460fb80d28212623bd9b9be3a4aeec246e00b7b5 (diff)
downloadtmwa-2617eddf316a50032775c438d165f64eb557cc0d.tar.gz
tmwa-2617eddf316a50032775c438d165f64eb557cc0d.tar.bz2
tmwa-2617eddf316a50032775c438d165f64eb557cc0d.tar.xz
tmwa-2617eddf316a50032775c438d165f64eb557cc0d.zip
Add googletest-1.8.1 as a submodule - gtest-1.14 shipped by my distro requires C++14.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 4 insertions, 1 deletions
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)