Skip to content

Commit

Permalink
Bump deps
Browse files Browse the repository at this point in the history
  • Loading branch information
robomics committed Apr 19, 2024
1 parent 7b1b324 commit 53d1d1b
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 29 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ include(FetchContent)
# cmake-format: off
FetchContent_Declare(
_project_options
URL ${CMAKE_CURRENT_SOURCE_DIR}/external/project_options-v0.28.0.tar.xz
URL_HASH SHA512=216d0970ace00e3176788a2b5abb7b92490c005111d26365e7807a5e86c6323e38b33e2e5b01f4ee43438a8f8e96cacf16cedc6f905a7e0ad58752905b260b38
URL ${CMAKE_CURRENT_SOURCE_DIR}/external/project_options-v0.33.0.tar.xz
URL_HASH SHA512=d652ff0b6fe4833dfd340ff9687358e7b39dc85157924a855cfc51079446d249b2ea58713a2dc430dd1b65b459399fd26dddecddbcb1b7f896082987bee46489
)
# cmake-format: on

Expand Down
47 changes: 22 additions & 25 deletions conanfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,32 @@
# SPDX-License-Identifier: MIT

[requires]
abseil/20230125.3#5431a4c609f5fb48bb8d8567e953243f
abseil/20240116.2#932ead913d27bb5087303c2880a7b06d
bitflags/1.5.0#626da9d1913161321841f30caf9b994e
boost/1.82.0#902463606663219fc8c6d2102f1b8c6a
bshoshany-thread-pool/3.5.0#3c9fd1e21a688432b7f31b40d2d168ee
bzip2/1.0.8#411fc05e80d47a89045edc1ee6f23c1d
catch2/3.3.2#99b3464731b1ad237007c24291481c2a
cli11/2.3.2#8ccdf14fb1ad53532d498c16ae580b4b
boost/1.84.0#fa2193d8ff1d493acd07ce9f42a67861
bshoshany-thread-pool/4.1.0#be1802a8768416a6c9b1393cf0ce5e9c
bzip2/1.0.8#457c272f7da34cb9c67456dd217d36c4
catch2/3.5.4#d346ca291f8f62040fd9c1a891654711
cli11/2.4.1#afacffd31f631bbb8b7c7d6425fe7a66
concurrentqueue/1.0.4#1e48e1c712bcfd892087c9c622a51502
cpp-sort/1.14.0#3453aaaf83c1dae4214ca3b5c4c3a5c8
fast_float/5.2.0#9bf1a3fac625789f2b571d43efb8013b
fmt/10.0.0#dd5e3eb81b512a1bb34a5aab88a07e82
hdf5/1.14.0#011206975dc4c5ca80dd612d3a34cab3 # hictk
highfive/2.7.1#a73bc6937c9add30c9d47a7a70a466eb # hictk
libarchive/3.6.2#b768ab8c0dcfb9e27b912a7f32fd02c1
libbigwig/0.4.7#c029f7693c143b39a52a99e0d43dff05
cpp-sort/1.15.0#a48647a61f03d08b77d15fb5a8bfbe5e
fast_float/6.1.1#e29acaa3d0543dee343abe3f6815346e
fmt/10.2.1#9199a7a0611866dea5c8849a77467b25
hictk/0.0.12#1358f43a6b7a5501a39c0e5a23ada55b
libarchive/3.7.3#0c1382b400534c5faa88cd82870be7f5
libbigwig/0.4.7#3f34dc76212124688b984b781e6f853d
libcuckoo/0.3.1#7e514d4c23a9aba3d8d80758824e9dc0
libdeflate/1.18#3697b637656a9af04cabcbed50db9a7e # hictk
lz4/1.9.4#bce1f314775b83c195dffc8e177ff368
range-v3/0.12.0#abb9932b80d96eaf8fc992debe3870ed
lz4/1.9.4#1217a03c990b79aa34ed0faede18f534
lzo/2.10#5725914235423c771cb1c6b607109b45
range-v3/0.12.0#4c05d91d7b40e6b91b44b5345ac64408
readerwriterqueue/1.0.6#aaa5ff6fac60c2aee591e9e51b063b83
spdlog/1.11.0#8b4bd1da26e0ec97698369d6224d93bf
span-lite/0.10.3#1967d71abb32b314387c2ab9c558dd22 # hictk
tomlplusplus/3.3.0#ebb2a36577011fb1959b0de8c1509a6d
tsl-hopscotch-map/2.3.0#497d3f41172cefe2df9ac17692c52734 # hictk
tsl-ordered-map/1.1.0#c8a6d6831f079d7fb012c46b5bcfa767 # hictk
spdlog/1.13.0#8e88198fd5b9ee31d329431a6d0ccaa2
tomlplusplus/3.4.0#92c93d4de6b0a6a2d0ae9b4430e09c9b
xoshiro-cpp/1.1#20f566efb3e2bf6e1b813d4abfc5e62c
xxhash/0.8.1#b60fcc5f9821c988a155935d87562e1d
xz_utils/5.4.2#b6ee8320403def553418874435445982
zlib/1.2.13#e377bee636333ae348d51ca90874e353
zstd/1.5.5#93372fe14bb7883bd4de82914e0a1841
xxhash/0.8.2#03fd1c9a839b3f9cdf5ea9742c312187
xz_utils/5.4.5#51e5a6e6564f4ea3afd79def01f035ad
zlib/1.3.1#f52e03ae3d251dec704634230cd806a2
zstd/1.5.6#67383dae85d33f43823e7751a6745ea1

[generators]
CMakeDeps
Expand Down Expand Up @@ -80,6 +76,7 @@ boost*:without_type_erasure=True
boost*:without_url=True
boost*:without_wave=True
bzip2*:enable_executable=False
hictk*:with_eigen=False
highfive*:with_boost=False
highfive*:with_eigen=False
highfive*:with_opencv=False
Expand Down
3 changes: 1 addition & 2 deletions external/checksums.sha512
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
aa339b9fb5f147c5d88341ed4abf85e88b78173714c3a994860aa81f3b558b674829c17a1567d04642ae9df3ce6ed0e88001ba143bb152e91ed7e75bc607a86b cmake-git-version-tracking.20221027.tar.xz
b8df4b89afba941851573033ddf72a5725faadc3476ff4ac9a1d9abb7070d6a503be4bdf91ace0fa0ec9b87239d801d45f0bc6170b284cc21b99f45dda55e507 coolerpp-0b19a5b.tar.xz
216d0970ace00e3176788a2b5abb7b92490c005111d26365e7807a5e86c6323e38b33e2e5b01f4ee43438a8f8e96cacf16cedc6f905a7e0ad58752905b260b38 project_options-v0.28.0.tar.xz
d652ff0b6fe4833dfd340ff9687358e7b39dc85157924a855cfc51079446d249b2ea58713a2dc430dd1b65b459399fd26dddecddbcb1b7f896082987bee46489 project_options-v0.33.0.tar.xz
Binary file removed external/hictk-24f75ae.tar.xz
Binary file not shown.
Binary file removed external/hictk-7a1a5d7.tar.xz
Binary file not shown.
Binary file removed external/project_options-v0.28.0.tar.xz
Binary file not shown.
Binary file added external/project_options-v0.33.0.tar.xz
Binary file not shown.
54 changes: 54 additions & 0 deletions setup_conan_environments.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
#!/usr/bin/env bash

# Copyright (C) 2024 Roberto Rossini (roberros@uio.no)
# SPDX-License-Identifier: MIT

set -e
set -u

# shellcheck disable=SC2064
trap "cd '$PWD'" EXIT

git_root="$(readlink -f "$(git rev-parse --show-toplevel)")"

wd="$git_root/conan-envs"
conanfile="$git_root/conanfile.txt"

for compiler in gcc clang; do
for build_type in Debug Release RelWithDebInfo; do
CC="$compiler"
if [[ "$compiler" == gcc* ]]; then
CXX="${compiler/gcc/g++}${compiler#gcc}"
profile=gcc
else
CXX="${compiler/clang/clang++}${compiler#clang}"
profile=clang
fi

export CC
export CXX

outdir="$wd/$compiler/$build_type"
rm -rf "$outdir"
mkdir -p "$outdir"

conan install \
--build=missing \
--update \
-pr "$profile" \
-s compiler.cppstd=17 \
-s build_type="$build_type" \
--output-folder="$outdir" \
"$conanfile"

conan install \
--build=missing \
--update \
-pr "$profile" \
-s compiler.cppstd=17 \
-s build_type="$build_type" \
-o shared=True \
--output-folder="$outdir" \
"$conanfile"
done
done

0 comments on commit 53d1d1b

Please sign in to comment.