From 3daafbafbd1ea284302bb09811fe5fead4c7309d Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Tue, 15 Aug 2017 10:28:35 -0400 Subject: [PATCH 1/2] add version 1.2.2 (HEAD) General update to 1.2.2 from HEAD to include fix for libcxx toolchain on some platforms. See: https://github.com/USCiLab/cereal/issues/339#issuecomment-322452566 --- cmake/configs/default.cmake | 2 +- cmake/projects/cereal/hunter.cmake | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 206c5e5fb5..4ae8c5a42e 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -127,7 +127,7 @@ hunter_config(aglet VERSION 1.2.0) hunter_config(autobahn-cpp VERSION 0.2.0) hunter_config(boost-pba VERSION 1.0.0-p0) hunter_config(ccv VERSION 0.7-p6) -hunter_config(cereal VERSION 1.2.1-p1) +hunter_config(cereal VERSION 1.2.2) hunter_config(ceres-solver VERSION 1.12.0-p1) hunter_config(clBLAS VERSION 2.10.0-p0) hunter_config(convertutf VERSION 1.0.1) diff --git a/cmake/projects/cereal/hunter.cmake b/cmake/projects/cereal/hunter.cmake index 3085a9bcfa..f660b6e79f 100644 --- a/cmake/projects/cereal/hunter.cmake +++ b/cmake/projects/cereal/hunter.cmake @@ -12,6 +12,17 @@ include(hunter_cacheable) hunter_cacheable(cereal) +hunter_add_version( + PACKAGE_NAME + cereal + VERSION + "1.2.2" + URL + "https://github.com/headupinclouds/cereal/archive/v1.2.2.tar.gz" + SHA1 + d0f0ac5daa244cb5c193d4de889a416fdeac9dc5 + ) + hunter_add_version( PACKAGE_NAME cereal From 23c14e673d12b38ad54c49c78f194e0bfb5805f9 Mon Sep 17 00:00:00 2001 From: David Hirvonen Date: Tue, 15 Aug 2017 12:45:02 -0400 Subject: [PATCH 2/2] use cereal v.1.2.2-p0 from hunter-packages/cereal --- cmake/configs/default.cmake | 2 +- cmake/projects/cereal/hunter.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index 4ae8c5a42e..1ea23c5567 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -127,7 +127,7 @@ hunter_config(aglet VERSION 1.2.0) hunter_config(autobahn-cpp VERSION 0.2.0) hunter_config(boost-pba VERSION 1.0.0-p0) hunter_config(ccv VERSION 0.7-p6) -hunter_config(cereal VERSION 1.2.2) +hunter_config(cereal VERSION 1.2.2-p0) hunter_config(ceres-solver VERSION 1.12.0-p1) hunter_config(clBLAS VERSION 2.10.0-p0) hunter_config(convertutf VERSION 1.0.1) diff --git a/cmake/projects/cereal/hunter.cmake b/cmake/projects/cereal/hunter.cmake index f660b6e79f..85c5670eda 100644 --- a/cmake/projects/cereal/hunter.cmake +++ b/cmake/projects/cereal/hunter.cmake @@ -16,11 +16,11 @@ hunter_add_version( PACKAGE_NAME cereal VERSION - "1.2.2" + "1.2.2-p0" URL - "https://github.com/headupinclouds/cereal/archive/v1.2.2.tar.gz" + "https://github.com/hunter-packages/cereal/archive/v1.2.2-p0.tar.gz" SHA1 - d0f0ac5daa244cb5c193d4de889a416fdeac9dc5 + 7325d29644654c16f066a8c887665c2cf78226c2 ) hunter_add_version(