Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Boost multiprecision and move zfp #3963

Merged
merged 3 commits into from
Apr 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Principia.sln
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Property Sheets", "
google_protobuf.props = google_protobuf.props
include_solution.props = include_solution.props
principia.props = principia.props
llnl_zfp.props = llnl_zfp.props
profiling.props = profiling.props
suppress_useless_warnings.props = suppress_useless_warnings.props
EndProjectSection
Expand Down
6 changes: 3 additions & 3 deletions base/base.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
</PropertyGroup>
<Import Project="$(SolutionDir)principia.props" />
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="..\third_party_zfp.props" />
<Import Project="..\llnl_zfp.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release_LLVM|x64'">
<Import Project="..\third_party_zfp.props" />
<Import Project="..\llnl_zfp.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="..\third_party_zfp.props" />
<Import Project="..\llnl_zfp.props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="array.hpp" />
Expand Down
4 changes: 2 additions & 2 deletions third_party_zfp.props → llnl_zfp.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<PropertyGroup />
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)..\Third Party\zfp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)..\LLNL\zfp\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(SolutionDir)..\Third Party\zfp\msvc\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)..\LLNL\zfp\msvc\$(PrincipiaDependencyConfiguration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>zfp.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
Expand Down
70 changes: 26 additions & 44 deletions rebuild_all_solutions.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -9,55 +9,37 @@ $dependencies = @(".\Google\glog\msvc\glog.sln",
".\Google\benchmark\msvc\google-benchmark.sln",
".\Google\gipfeli\msvc\gipfeli.sln",
".\Google\abseil-cpp\msvc\abseil-cpp.sln",
".\Third Party\zfp\msvc\zfp.sln")
".\LLNL\zfp\msvc\zfp.sln")

New-Item -ItemType Directory -Force -Path "Google"
New-Item -ItemType Directory -Force -Path "Third Party"

push-location -path "Google"
foreach ($repository in @("glog", "googletest", "protobuf", "benchmark",
"gipfeli", "abseil-cpp", "chromium")) {
if (!(test-path -path $repository)) {
git clone ("https://github.com/mockingbirdnest/" + $repository + ".git")
}
push-location $repository
git checkout master
git pull
if (!$?) {
if ($args[0] -eq "--force") {
git reset --hard origin/master
git clean -fdx
} else {
pop-location
pop-location
exit 1
foreach ($directory_and_repositories in @(
@("Boost", @("multiprecision")),
@("Google", @("glog", "googletest", "protobuf", "benchmark",
"gipfeli", "abseil-cpp", "chromium")),
@("LLNL", @("zfp")))) {
$directory, $repositories = $directory_and_repositories
New-Item -ItemType Directory -Force -Path $directory
Push-Location -Path $directory
foreach ($repository in $repositories) {
if (!(Test-Path -Path $repository)) {
git clone ("https://github.com/mockingbirdnest/" + $repository + ".git")
}
}
pop-location
}
pop-location

push-location -path "Third Party"
foreach ($repository in @("zfp")) {
if (!(test-path -path $repository)) {
git clone ("https://github.com/mockingbirdnest/" + $repository + ".git")
}
push-location $repository
git checkout master
git pull
if (!$?) {
if ($args[0] -eq "--force") {
git reset --hard origin/master
git clean -fdx
} else {
pop-location
pop-location
exit 1
Push-Location $repository
git fetch
git checkout origin/HEAD
if (!$?) {
if ($args[0] -eq "--force") {
git reset --hard origin/HEAD
git clean -fdx
} else {
Pop-Location
Pop-Location
exit 1
}
}
Pop-Location
}
pop-location
Pop-Location
}
pop-location

function build_solutions($solutions) {
foreach ($configuration in "Debug", "Release") {
Expand Down
2 changes: 1 addition & 1 deletion shared/base.vcxitems
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ItemsProjectGuid>{a82cb04c-42e1-4ebe-9816-6fc033a9c2b5}</ItemsProjectGuid>
</PropertyGroup>
<ImportGroup Label="PropertySheets">
<Import Project="..\third_party_zfp.props" />
<Import Project="..\llnl_zfp.props" />
</ImportGroup>
<ItemDefinitionGroup>
<ClCompile>
Expand Down
12 changes: 0 additions & 12 deletions third_party_optional.props

This file was deleted.