Skip to content

Commit

Permalink
update to latest versions of dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
gregjohnson committed May 11, 2022
1 parent bf6866b commit 7a4addc
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
14 changes: 7 additions & 7 deletions superbuild/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,10 @@ endif()

option(BUILD_RKCOMMON "Build rkcommon or search in environment?" ON)
if (BUILD_RKCOMMON)
set(RKCOMMON_VERSION "v1.9.0" CACHE STRING "rkcommon version to download")
set(RKCOMMON_VERSION "v1.10.0" CACHE STRING "rkcommon version to download")
set(RKCOMMON_URL "https://github.com/ospray/rkcommon/archive/${RKCOMMON_VERSION}.zip"
CACHE STRING "URL of the rkcommon archive.")
set(RKCOMMON_HASH "54ef58226b5f2b6eb80091d806b94d563ce748a6c8d04db7836c20945fd99929"
set(RKCOMMON_HASH "eb968868b85254680c59ff3e091e9a7634d407cf0375d2b52840bf9044716a48"
CACHE STRING "SHA256 hash of the rkcommon archive.")
include(dep_rkcommon)
endif()
Expand Down Expand Up @@ -196,7 +196,7 @@ if (BUILD_GLFW)
set(GLFW_VERSION "3.2.1")
set(GLFW_URL "https://github.com/glfw/glfw/archive/${GLFW_VERSION}.zip"
CACHE STRING "URL of the GLFW source archive.")
set(GLFW_HASH "0c623f65a129c424d0fa45591694fde3719ad4a0955d4835182fda71b255446f"
set(GLFW_HASH "0c623f65a129c424d0fa45591694fde3719ad4a0955d4835182fda71b255446f"
CACHE STRING "SHA256 hash of the GLFW source archive.")
include(dep_glfw)
endif()
Expand Down Expand Up @@ -226,10 +226,10 @@ if (BUILD_OPENVDB)
message(WARNING "Disabling OpenVDB support because the icc compiler version is too low (19.1 is required)")
set(BUILD_OPENVDB OFF)
else()
set(ILMBASE_VERSION "2.5.7")
set(ILMBASE_VERSION "2.5.8")
set(ILMBASE_URL "https://github.com/AcademySoftwareFoundation/openexr/archive/v${ILMBASE_VERSION}.zip"
CACHE STRING "URL of the IlmBase archive.")
set(ILMBASE_HASH "95e2625dac696bcd8101b575cc7651f7c4d14faf9f196a2bedf5b9373b263d4f"
set(ILMBASE_HASH "3eafee956ae36cad536497988df4bda88d811a602ad93630dbed38bb10b8a7e4"
CACHE STRING "SHA256 hash of the IlmBase archive.")
include(dep_ilmbase)

Expand All @@ -240,11 +240,11 @@ if (BUILD_OPENVDB)
CACHE STRING "SHA256 hash of the zlib archive.")
include(dep_zlib)

set(BOOST_VERSION "1.78.0")
set(BOOST_VERSION "1.79.0")
string(REPLACE "." "_" BOOST_FILE_BASE "${BOOST_VERSION}")
set(BOOST_BASE_URL "https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION}/source/boost")
set(_BOOST_URL "${BOOST_BASE_URL}_${BOOST_FILE_BASE}.tar.gz")
set(_BOOST_HASH "94ced8b72956591c4775ae2207a9763d3600b30d9d7446562c552f0a14a63be7")
set(_BOOST_HASH "273f1be93238a068aba4f9735a4a2b003019af067b9c183ed227780b8f36062c")
set(BOOST_URL "${_BOOST_URL}" CACHE STRING "URL of the boost archive.")
set(BOOST_HASH "${_BOOST_HASH}" CACHE STRING "SHA256 hash of the boost archive.")
include(dep_boost)
Expand Down
14 changes: 9 additions & 5 deletions testing/external/catch.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Catch v2.13.8
* Generated: 2022-01-03 21:20:09.589503
* Catch v2.13.9
* Generated: 2022-04-12 22:37:23.260201
* ----------------------------------------------------------
* This file has been merged from multiple headers. Please don't edit it directly
* Copyright (c) 2022 Two Blue Cubes Ltd. All rights reserved.
Expand All @@ -15,7 +15,7 @@

#define CATCH_VERSION_MAJOR 2
#define CATCH_VERSION_MINOR 13
#define CATCH_VERSION_PATCH 8
#define CATCH_VERSION_PATCH 9

#ifdef __clang__
# pragma clang system_header
Expand Down Expand Up @@ -13392,6 +13392,10 @@ namespace Catch {
filename.erase(0, lastSlash);
filename[0] = '#';
}
else
{
filename.insert(0, "#");
}

auto lastDot = filename.find_last_of('.');
if (lastDot != std::string::npos) {
Expand Down Expand Up @@ -15387,7 +15391,7 @@ namespace Catch {
}

Version const& libraryVersion() {
static Version version( 2, 13, 8, "", 0 );
static Version version( 2, 13, 9, "", 0 );
return version;
}

Expand Down Expand Up @@ -17890,7 +17894,7 @@ using Catch::Detail::Approx;
#define INFO( msg ) (void)(0)
#define UNSCOPED_INFO( msg ) (void)(0)
#define WARN( msg ) (void)(0)
#define CAPTURE( msg ) (void)(0)
#define CAPTURE( ... ) (void)(0)

#define TEST_CASE( ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
#define TEST_CASE_METHOD( className, ... ) INTERNAL_CATCH_TESTCASE_NO_REGISTRATION(INTERNAL_CATCH_UNIQUE_NAME( C_A_T_C_H_T_E_S_T_ ))
Expand Down

0 comments on commit 7a4addc

Please sign in to comment.