diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | configure | 5 | ||||
| m--------- | deps/googletest | 0 |
3 files changed, 7 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index cda3381..6ae9465 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "deps/attoconf"] path = deps/attoconf url = https://git.themanaworld.org/specing/attobuild +[submodule "deps/googletest"] + path = deps/googletest + url = https://github.com/google/googletest.git @@ -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) diff --git a/deps/googletest b/deps/googletest new file mode 160000 +Subproject 2fe3bd994b3189899d93f1d5a881e725e046fdc |