summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authormazong1123 <mazong1123@gmail.com>2016-05-15 12:48:08 (GMT)
committermazong1123 <mazong1123@gmail.com>2016-05-15 12:48:08 (GMT)
commit2746b57f78a05671bd605623be492dc74d6860bd (patch)
tree7dcf89afab0d43d519df0ad9d6fec52ed190b0ba /googlemock
parentd225acc90bc3a8c420a9bcd1f033033c1ccd7fe0 (diff)
downloadgoogletest-2746b57f78a05671bd605623be492dc74d6860bd.zip
googletest-2746b57f78a05671bd605623be492dc74d6860bd.tar.gz
googletest-2746b57f78a05671bd605623be492dc74d6860bd.tar.bz2
Changed the GTestDir marco value to reflect the new dir of googletest.
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/msvc/2005/gmock_config.vsprops2
-rw-r--r--googlemock/msvc/2010/gmock_config.props2
2 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/msvc/2005/gmock_config.vsprops b/googlemock/msvc/2005/gmock_config.vsprops
index 8b65cfb..875939c 100644
--- a/googlemock/msvc/2005/gmock_config.vsprops
+++ b/googlemock/msvc/2005/gmock_config.vsprops
@@ -10,6 +10,6 @@
/>
<UserMacro
Name="GTestDir"
- Value="../../gtest"
+ Value="../../../googletest"
/>
</VisualStudioPropertySheet>
diff --git a/googlemock/msvc/2010/gmock_config.props b/googlemock/msvc/2010/gmock_config.props
index bd497f1..441f31c 100644
--- a/googlemock/msvc/2010/gmock_config.props
+++ b/googlemock/msvc/2010/gmock_config.props
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="UserMacros">
- <GTestDir>../../gtest</GTestDir>
+ <GTestDir>../../../googletest</GTestDir>
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>