Adjust the paths for gtest and gmock.

mockingbirdnest · Jun 9, 2019 · ef4bd0f · ef4bd0f
1 parent ca3e674
commit ef4bd0f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/google_googlemock_main.props b/google_googlemock_main.props
@@ -7,7 +7,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)..\Google\googletest\googlemock\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\Google\googletest\googlemock\msvc\2017\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\Google\googletest\googlemock\msvc\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>gmock.lib;gmock_main.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

diff --git a/google_googletest.props b/google_googletest.props
@@ -10,7 +10,7 @@
       <AdditionalIncludeDirectories>$(SolutionDir)..\Google\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>$(SolutionDir)..\Google\googletest\googletest\msvc\2017\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\Google\googletest\googletest\msvc\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>

diff --git a/rebuild_all_solutions.ps1 b/rebuild_all_solutions.ps1
@@ -3,8 +3,8 @@ $ErrorActionPreference = "Stop"
 $msbuild = &".\Principia\find_msbuild.ps1"
 
 $dependencies = @(".\Google\glog\google-glog.sln",
-                  ".\Google\googletest\googletest\msvc\2017\gtest.sln",
-                  ".\Google\googletest\googlemock\msvc\2017\gmock.sln",
+                  ".\Google\googletest\googletest\msvc\gtest.sln",
+                  ".\Google\googletest\googlemock\msvc\gmock.sln",
                   ".\Google\protobuf\vsprojects\protobuf.sln",
                   ".\Google\benchmark\msvc\google-benchmark.sln",
                   ".\Google\gipfeli\msvc\gipfeli.sln",