diff --git a/google_googlemock_main.props b/google_googlemock_main.props index 0d1bbf8de0..166bd1449d 100644 --- a/google_googlemock_main.props +++ b/google_googlemock_main.props @@ -7,7 +7,7 @@ $(SolutionDir)..\Google\googletest\googlemock\include;%(AdditionalIncludeDirectories) - $(SolutionDir)..\Google\googletest\googlemock\msvc\2017\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories) + $(SolutionDir)..\Google\googletest\googlemock\msvc\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories) gmock.lib;gmock_main.lib;%(AdditionalDependencies) diff --git a/google_googletest.props b/google_googletest.props index e8fccdf840..048115ea90 100644 --- a/google_googletest.props +++ b/google_googletest.props @@ -10,7 +10,7 @@ $(SolutionDir)..\Google\googletest\googletest\include;%(AdditionalIncludeDirectories) - $(SolutionDir)..\Google\googletest\googletest\msvc\2017\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories) + $(SolutionDir)..\Google\googletest\googletest\msvc\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories) gtest.lib;%(AdditionalDependencies) diff --git a/rebuild_all_solutions.ps1 b/rebuild_all_solutions.ps1 index 39f364972e..7dfad5d510 100644 --- 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",