summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFreeyorp <TheFreeYorp+git@gmail.com>2024-06-05 23:43:24 +0000
committerFreeyorp <TheFreeYorp+git@gmail.com>2024-06-05 23:57:13 +0000
commitbe3001b079632f5575625043cd0b425f8af5b24b (patch)
tree487f5d7f87700642096662976686b4c4c686b0f8
parentdd024fdf9ca01c02b79371512672f6798468020d (diff)
downloadtmwa-be3001b079632f5575625043cd0b425f8af5b24b.tar.gz
tmwa-be3001b079632f5575625043cd0b425f8af5b24b.tar.bz2
tmwa-be3001b079632f5575625043cd0b425f8af5b24b.tar.xz
tmwa-be3001b079632f5575625043cd0b425f8af5b24b.zip
configure: srcdir for GTEST_DIR default
The default value for GTEST_DIR should be deps/googletest/googletest under the source directory, not under the build directory. The build directory will often not have anything in it at all in the case of an out-of-tree build. This allows some tests to run for out-of-tree builds.
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 31c0c47..468f029 100755
--- a/configure
+++ b/configure
@@ -88,7 +88,7 @@ class Configuration(Cxx, Install, ConfigHash, Templates):
# 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'),
+ init=os.path.join(os.path.abspath(self.srcdir), '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)