diff '--color=auto' -ur openvdb-13.0.0.orig/cmake/config/OpenVDBCXX.cmake openvdb-13.0.0/cmake/config/OpenVDBCXX.cmake
--- openvdb-13.0.0.orig/cmake/config/OpenVDBCXX.cmake	2025-11-04 00:04:25.000000000 +0100
+++ openvdb-13.0.0/cmake/config/OpenVDBCXX.cmake	2026-03-17 16:47:32.987431130 +0100
@@ -255,7 +255,7 @@
 # DebugNoInfo - An internal build type only used by the OpenVDB CI. no optimizations, no symbols, asserts enabled
 set(CMAKE_CXX_FLAGS_DebugNoInfo "" CACHE STRING "Flags used by the C++ compiler during DebugNoInfo builds.")
 
-foreach(TYPE ${EXTRA_BUILD_TYPES})
+foreach(TYPE IN LISTS EXTRA_BUILD_TYPES)
   set(CMAKE_CXX_FLAGS_${U_TYPE} "" CACHE STRING "Flags used by the C++ compiler during ${TYPE} builds.")
   set(CMAKE_SHARED_LINKER_FLAGS_${U_TYPE} "" CACHE STRING "Flags used by the linker during ${TYPE} builds.")
   set(CMAKE_EXE_LINKER_FLAGS_${U_TYPE} "" CACHE STRING "Flags used by the linker during ${TYPE} builds.")
diff '--color=auto' -ur openvdb-13.0.0.orig/CMakeLists.txt openvdb-13.0.0/CMakeLists.txt
--- openvdb-13.0.0.orig/CMakeLists.txt	2026-03-17 16:47:14.185858704 +0100
+++ openvdb-13.0.0/CMakeLists.txt	2026-03-17 16:47:32.987504780 +0100
@@ -321,9 +321,7 @@
     cmake/FindBlosc.cmake
     cmake/FindJemalloc.cmake
     cmake/FindLog4cplus.cmake
-    cmake/FindOpenEXR.cmake
     cmake/FindOpenVDB.cmake
-    cmake/FindTBB.cmake
     cmake/OpenVDBGLFW3Setup.cmake
     cmake/OpenVDBHoudiniSetup.cmake
     cmake/OpenVDBMayaSetup.cmake
diff '--color=auto' -ur openvdb-13.0.0.orig/nanovdb/nanovdb/unittest/CMakeLists.txt openvdb-13.0.0/nanovdb/nanovdb/unittest/CMakeLists.txt
--- openvdb-13.0.0.orig/nanovdb/nanovdb/unittest/CMakeLists.txt	2026-03-17 16:47:14.148858864 +0100
+++ openvdb-13.0.0/nanovdb/nanovdb/unittest/CMakeLists.txt	2026-03-17 16:47:32.987558790 +0100
@@ -20,7 +20,7 @@
 
 ###############################################################################
 # TODO: Benchmark should probably not require gtest.
-if(NOT TARGET GTest::GTest)
+if(NOT TARGET GTest::gtest_main)
   message(WARNING " - GTest required to build unittests. Skipping.")
   return()
 endif()
@@ -42,19 +42,19 @@
 # -----------------------------------------------------------------------------
 
 add_executable(nanovdb_test_nanovdb "TestNanoVDB.cc")
-target_link_libraries(nanovdb_test_nanovdb PRIVATE nanovdb GTest::GTest GTest::Main)
+target_link_libraries(nanovdb_test_nanovdb PRIVATE nanovdb GTest::gtest GTest::gtest_main)
 add_test(nanovdb_unit_test nanovdb_test_nanovdb)
 
 # -----------------------------------------------------------------------------
 
 if(NANOVDB_USE_CUDA)
   add_executable(nanovdb_test_cuda "TestNanoVDB.cu")
-  target_link_libraries(nanovdb_test_cuda PRIVATE nanovdb GTest::GTest GTest::Main)
+  target_link_libraries(nanovdb_test_cuda PRIVATE nanovdb GTest::gtest GTest::gtest_main)
   set_target_properties(nanovdb_test_cuda PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
   add_test(nanovdb_cuda_unit_test nanovdb_test_cuda)
 
   add_executable(nanovdb_test_mgpu "TestMultiGPU.cu")
-  target_link_libraries(nanovdb_test_mgpu PRIVATE nanovdb GTest::GTest GTest::Main)
+  target_link_libraries(nanovdb_test_mgpu PRIVATE nanovdb GTest::gtest GTest::gtest_main)
   set_target_properties(nanovdb_test_mgpu PROPERTIES CUDA_SEPARABLE_COMPILATION ON)
   add_test(nanovdb_mgpu_unit_test nanovdb_test_mgpu)
 endif()
@@ -67,5 +67,5 @@
 endif()
 
 add_executable(nanovdb_test_openvdb "TestOpenVDB.cc")
-target_link_libraries(nanovdb_test_openvdb PRIVATE nanovdb GTest::GTest GTest::Main)
+target_link_libraries(nanovdb_test_openvdb PRIVATE nanovdb GTest::gtest GTest::gtest_main)
 add_test(nanovdb_openvdb_unit_test nanovdb_test_openvdb)
diff '--color=auto' -ur openvdb-13.0.0.orig/openvdb/openvdb/unittest/CMakeLists.txt openvdb-13.0.0/openvdb/openvdb/unittest/CMakeLists.txt
--- openvdb-13.0.0.orig/openvdb/openvdb/unittest/CMakeLists.txt	2026-03-17 16:47:14.132473559 +0100
+++ openvdb-13.0.0/openvdb/openvdb/unittest/CMakeLists.txt	2026-03-17 16:48:18.982578505 +0100
@@ -47,7 +47,7 @@
   list(APPEND OPENVDB_TEST_DEPENDENT_LIBS GTest::gtest GTest::gtest_main)
 else()
   # Older targets, only defined by the Module find_package calls
-  list(APPEND OPENVDB_TEST_DEPENDENT_LIBS GTest::GTest GTest::Main)
+  list(APPEND OPENVDB_TEST_DEPENDENT_LIBS GTest::gtest GTest::gtest_main)
 endif()
 
 if(CONCURRENT_MALLOC STREQUAL "Jemalloc")
diff '--color=auto' -ur openvdb-13.0.0.orig/openvdb_ax/openvdb_ax/test/CMakeLists.txt openvdb-13.0.0/openvdb_ax/openvdb_ax/test/CMakeLists.txt
--- openvdb-13.0.0.orig/openvdb_ax/openvdb_ax/test/CMakeLists.txt	2026-03-17 16:47:14.115369388 +0100
+++ openvdb-13.0.0/openvdb_ax/openvdb_ax/test/CMakeLists.txt	2026-03-17 16:48:10.909613414 +0100
@@ -63,7 +63,7 @@
   list(APPEND OPENVDB_AX_TEST_DEPENDENT_LIBS GTest::gtest GTest::gtest_main)
 else()
   # Older targets, only defined by the Module find_package calls
-  list(APPEND OPENVDB_AX_TEST_DEPENDENT_LIBS GTest::GTest GTest::Main)
+  list(APPEND OPENVDB_AX_TEST_DEPENDENT_LIBS GTest::GTest GTest::gtest_main)
 endif()
 
 
@@ -171,7 +171,7 @@
   endif()
 endif()
 
-add_test(NAME vdb_ax_unit_test COMMAND vdb_ax_test -v WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../)
+add_test(NAME vdb_ax_unit_test COMMAND vdb_ax_test -v WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
 # For the sanitizers, add the suppression files and additional options
 get_filename_component(PATH_TO_PROJECT_ROOT ${CMAKE_CURRENT_LIST_DIR} DIRECTORY)