summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSergiu Dotenco <sergiu.dotenco@th-nuernberg.de>2015-03-26 14:56:33 (GMT)
committerSergiu Dotenco <sergiu.dotenco@gmail.com>2015-07-15 20:34:58 (GMT)
commitea628ae809aa3ab7ab9137103c4deea5c7485414 (patch)
treedfcb0385433f06c3705e769c491c499b04481ab4 /src
parent332525803605d752ff054535cb0600d680f4ac9a (diff)
downloadglog-ea628ae809aa3ab7ab9137103c4deea5c7485414.zip
glog-ea628ae809aa3ab7ab9137103c4deea5c7485414.tar.gz
glog-ea628ae809aa3ab7ab9137103c4deea5c7485414.tar.bz2
allow to define TEST_SRC_DIR as a macro
Diffstat (limited to 'src')
-rw-r--r--src/googletest.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/googletest.h b/src/googletest.h
index 2525bc3..b4677b2 100644
--- a/src/googletest.h
+++ b/src/googletest.h
@@ -81,7 +81,7 @@ static inline string GetTempDir() {
#endif
}
-#if defined(OS_WINDOWS) && defined(_MSC_VER)
+#if defined(OS_WINDOWS) && defined(_MSC_VER) && !defined(TEST_SRC_DIR)
// The test will run in glog/vsproject/<project name>
// (e.g., glog/vsproject/logging_unittest).
static const char TEST_SRC_DIR[] = "../..";