Bump dependencies (#106)

- Bump version for fmt and spdlog - Bump revision for boost - Install catch2 using conan
paulsengroup · Jan 28, 2024 · d11ecb0 · d11ecb0
1 parent a513314
commit d11ecb0
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 24 deletions.
diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml
@@ -134,14 +134,19 @@ jobs:
 
       - name: Install build dependencies
         run: |
-          conan install .                                         \
-             --build=missing                                      \
-             -pr:h default                                        \
-             -pr:b default                                        \
-             -s "compiler=${{ matrix.compiler-name }}"            \
-             -s "build_type=${{ matrix.build_type }}"             \
-             -s "compiler.runtime_type=${{ matrix.build_type }}"  \
-             -s compiler.cppstd=17                                \
+          conan install .                                           \
+             --build=missing                                        \
+             --build="catch2/*"                                     \
+             -pr:h default                                          \
+             -pr:b default                                          \
+             -s:h "compiler=${{ matrix.compiler-name }}"            \
+             -s:h "build_type=${{ matrix.build_type }}"             \
+             -s:h "compiler.runtime_type=${{ matrix.build_type }}"  \
+             -s:h compiler.cppstd=17                                \
+             -s:b "compiler=${{ matrix.compiler-name }}"            \
+             -s:b "build_type=${{ matrix.build_type }}"             \
+             -s:b "compiler.runtime_type=${{ matrix.build_type }}"  \
+             -s:b compiler.cppstd=17                                \
              --output-folder=build
 
       - name: Clean Conan cache (post-build)

diff --git a/conanfile.txt b/conanfile.txt
@@ -3,20 +3,21 @@
 # SPDX-License-Identifier: MIT
 
 [requires]
-boost/1.83.0#7825569cd0622461dec7bc87dfdf47ae
+boost/1.83.0#39551a6ba03b4fe2c7a86b9a6d80cd67
 bshoshany-thread-pool/3.5.0#5aaea7ccf37107d3c1ba9ca9ab246e42
-concurrentqueue/1.0.4#1e48e1c712bcfd892087c9c622a51502
+catch2/3.5.2#9554dc3c4ffcab50daf8f2cac4b79308
 cli11/2.3.2#1424b9b1d9e3682a7122f415b078b4d7
+concurrentqueue/1.0.4#1e48e1c712bcfd892087c9c622a51502
 eigen/3.4.0#2e192482a8acff96fe34766adca2b24c
 fast_float/6.0.0#6c8a953c57879453982a6ce69c0ba87c
-fmt/10.1.1#cd63809a79574a2f9eb73ca35f16a243
+fmt/10.2.1#9199a7a0611866dea5c8849a77467b25
 hdf5/1.14.3#31ccd8d4de83844f5db48471df1944a1
 highfive/2.8.0#b1de99f678ff5699cce6fb5fcac44d2d
 libdeflate/1.19#3ea74a4549efc14d4b1202dc4bfbf602
 parallel-hashmap/1.3.11#1e67f4855a3f7cdeb977cc472113baf7
 readerwriterqueue/1.0.6#aaa5ff6fac60c2aee591e9e51b063b83
 span-lite/0.10.3#1967d71abb32b314387c2ab9c558dd22
-spdlog/1.12.0#0e390a2f5c3e96671d0857bc734e4731
+spdlog/1.13.0#2775cc949e26b339029a852785b6b276
 zstd/1.5.5#b87dc3b185caa4b122979ac4ae8ef7e8
 
 [generators]

diff --git a/external/catch2-v3.4.0.tar.xz b/external/catch2-v3.4.0.tar.xz
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -2,18 +2,6 @@
 #
 # SPDX-License-Identifier: MIT
 
-FetchContent_Declare(
-  _hictk_catch2
-  URL ${PROJECT_SOURCE_DIR}/external/catch2-v3.4.0.tar.xz
-  URL_HASH SHA256=757d1b29b836e2c816784e062785e57ad852317de6242465129d4acb65b58b4d
-  EXCLUDE_FROM_ALL SYSTEM)
-
-FetchContent_MakeAvailable(_hictk_catch2)
-target_disable_clang_tidy(Catch2)
-target_disable_clang_tidy(Catch2WithMain)
-
-list(APPEND CMAKE_MODULE_PATH ${_hictk_catch2_SOURCE_DIR}/extras)
-
 add_subdirectory(units)
 add_subdirectory(utils)
 

diff --git a/test/units/balancing/CMakeLists.txt b/test/units/balancing/CMakeLists.txt
@@ -4,6 +4,7 @@
 
 find_package(Filesystem REQUIRED)
 
+find_package(Catch2 REQUIRED)
 include(CTest)
 include(Catch)
 

diff --git a/test/units/bin_table/CMakeLists.txt b/test/units/bin_table/CMakeLists.txt
@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 find_package(Filesystem REQUIRED)
+find_package(Catch2 REQUIRED)
 find_package(fmt REQUIRED)
 
 include(CTest)

diff --git a/test/units/chromosome/CMakeLists.txt b/test/units/chromosome/CMakeLists.txt
@@ -4,6 +4,7 @@
 
 find_package(Filesystem REQUIRED)
 
+find_package(Catch2 REQUIRED)
 include(CTest)
 include(Catch)
 

diff --git a/test/units/cooler/CMakeLists.txt b/test/units/cooler/CMakeLists.txt
@@ -4,6 +4,7 @@
 
 find_package(Filesystem REQUIRED)
 
+find_package(Catch2 REQUIRED)
 include(CTest)
 include(Catch)
 

diff --git a/test/units/file/CMakeLists.txt b/test/units/file/CMakeLists.txt
@@ -4,6 +4,7 @@
 
 find_package(Filesystem REQUIRED)
 
+find_package(Catch2 REQUIRED)
 include(CTest)
 include(Catch)
 

diff --git a/test/units/hic/CMakeLists.txt b/test/units/hic/CMakeLists.txt
@@ -4,6 +4,7 @@
 
 find_package(Filesystem REQUIRED)
 
+find_package(Catch2 REQUIRED)
 include(CTest)
 include(Catch)
 

diff --git a/test/units/pixel/CMakeLists.txt b/test/units/pixel/CMakeLists.txt
@@ -4,6 +4,7 @@
 
 find_package(Filesystem REQUIRED)
 
+find_package(Catch2 REQUIRED)
 include(CTest)
 include(Catch)
 

diff --git a/test/units/reference/CMakeLists.txt b/test/units/reference/CMakeLists.txt
@@ -4,6 +4,7 @@
 
 find_package(Filesystem REQUIRED)
 
+find_package(Catch2 REQUIRED)
 include(CTest)
 include(Catch)
 

diff --git a/test/units/transformers/CMakeLists.txt b/test/units/transformers/CMakeLists.txt
@@ -4,6 +4,7 @@
 
 find_package(Filesystem REQUIRED)
 
+find_package(Catch2 REQUIRED)
 include(CTest)
 include(Catch)
 

diff --git a/test/units/variant/CMakeLists.txt b/test/units/variant/CMakeLists.txt
@@ -4,6 +4,7 @@
 
 find_package(Filesystem REQUIRED)
 
+find_package(Catch2 REQUIRED)
 include(CTest)
 include(Catch)