Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 9af60f70c281
Choose a base ref
...
head repository: mockingbirdnest/Principia
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9b5b8ee7d54f
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jan 1, 2018

  1. Change the location of googletest.

    @pleroy
    pleroy committed Jan 1, 2018
    Copy the full SHA
    89d59c7 View commit details

  2. Update the rebuild script.

    @pleroy
    pleroy committed Jan 1, 2018
    Copy the full SHA
    d13b5d0 View commit details

Commits on Jan 2, 2018

  1. Merge pull request #1663 from pleroy/Sync 

    Change the location of googletest
    @pleroy
    pleroy authored Jan 2, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9b5b8ee View commit details
Showing with 3 additions and 2 deletions.
  1. +1 −0 Principia.sln
  2. +1 −1 google_googletest.props
  3. +1 −1 rebuild_all_solutions.ps1
1 change: 1 addition & 0 deletions Principia.sln
View file
Original file line number Diff line number Diff line change
@@ -83,6 +83,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{B0F47E49-0EDF-4D58-AB27-F99CCCE4253A}"
ProjectSection(SolutionItems) = preProject
generate_version_translation_unit.ps1 = generate_version_translation_unit.ps1
rebuild_all_solutions.ps1 = rebuild_all_solutions.ps1
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "coverage_analyser", "coverage_analyser\coverage_analyser.csproj", "{06E78A3D-AAA0-4CD9-8F23-B5BBBBE6F14F}"
2 changes: 1 addition & 1 deletion google_googletest.props
View file
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@
<AdditionalIncludeDirectories>$(SolutionDir)..\Google\googletest\googletest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(SolutionDir)..\Google\googletest\googletest\msvc\$(Configuration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)..\Google\googletest\googletest\msvc\2015\$(Configuration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>gtest.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
2 changes: 1 addition & 1 deletion rebuild_all_solutions.ps1
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$msbuild = join-path -path (Get-ItemProperty "HKLM:\software\Microsoft\MSBuild\ToolsVersions\14.0")."MSBuildToolsPath" -childpath "msbuild.exe"
$dependencies = @(".\Google\glog\google-glog.sln",
".\Google\googletest\googletest\msvc\gtest.sln",
".\Google\googletest\googletest\msvc\2015\gtest.sln",
".\Google\googletest\googlemock\msvc\2015\gmock.sln",
".\Google\protobuf\vsprojects\protobuf.sln",
".\Google\benchmark\msvc\google-benchmark.sln")