Merge remote-tracking branch 'upstream/master' into fix_macos_houdini

Author: danrbailey

cmake/FindBlosc.cmake

@@ -188,22 +188,6 @@ list(APPEND _BLOSC_LIBRARYDIR_SEARCH_DIRS
   ${SYSTEM_LIBRARY_PATHS}
 )
 
-# Library suffix handling
-
-set(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
-set(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES})
-
-if(MSVC)
-  if(BLOSC_USE_STATIC_LIBS)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
-    set(CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES};lib")
-  endif()
-else()
-  if(BLOSC_USE_STATIC_LIBS)
-    set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
-  endif()
-endif()
-
 set(Blosc_LIB_COMPONENTS "")
 # NOTE: Search for debug version first (see vcpkg hack)
 list(APPEND BLOSC_BUILD_TYPES DEBUG RELEASE)
@@ -246,13 +230,6 @@ foreach(BUILD_TYPE ${BLOSC_BUILD_TYPES})
   set(CMAKE_IGNORE_PATH ${_BLOSC_CMAKE_IGNORE_PATH})
 endforeach()
 
-# Reset library suffix
-
-set(CMAKE_FIND_LIBRARY_SUFFIXES ${_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-set(CMAKE_FIND_LIBRARY_PREFIXES ${_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES})
-unset(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES)
-unset(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES)
-
 if(Blosc_LIBRARY_DEBUG AND Blosc_LIBRARY_RELEASE)
   # if the generator is multi-config or if CMAKE_BUILD_TYPE is set for
   # single-config generators, set optimized and debug libraries

nanovdb/nanovdb/unittest/TestNanoVDB.cu

@@ -22,6 +22,7 @@
 
 #include <gtest/gtest.h>
 #include <algorithm>// for std::sort
+#include <iomanip> // for std::setw, std::setfill
 
 namespace nanovdb {// this namespace is required by gtest
 

pendingchanges/windows_static_blosc.txt

@@ -0,0 +1,2 @@
+Build:
+    - Fixed an issue with the Blosc CMake FindPackage for the OpenVDB Windows static library.