Skip to content

Commit dcbff8a

Browse files
committed
build: Adjust OpenVDB version requirements vs C++17 (AcademySoftwareFoundation#4030)
Revision of PR AcademySoftwareFoundation#4023 I have since determined that although OpenVDB raised their own build requirements to C++17 starting with 10.0, it wasn't until 10.1 that C++17-isms crept into their header files and force downstream projects to need C++17 to consume OpenVDB's headers. So we can go back to allowing use of OpenVDB 10.0 even when we are building with C++14. Signed-off-by: Larry Gritz <[email protected]>
1 parent e0f5086 commit dcbff8a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/cmake/externalpackages.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,8 @@ checked_find_package (OpenVDB
234234
VERSION_MIN 5.0
235235
DEPS TBB
236236
DEFINITIONS -DUSE_OPENVDB=1)
237-
if (OpenVDB_FOUND AND OpenVDB_VERSION VERSION_GREATER_EQUAL 10.0 AND CMAKE_CXX_STANDARD VERSION_LESS 17)
238-
message (WARNING "${ColorYellow}OpenVDB >= 10.0 (we found ${OpenVDB_VERSION}) can only be used when we build with C++17 or higher. Disabling OpenVDB support.${ColorReset}")
237+
if (OpenVDB_FOUND AND OpenVDB_VERSION VERSION_GREATER_EQUAL 10.1 AND CMAKE_CXX_STANDARD VERSION_LESS 17)
238+
message (WARNING "${ColorYellow}OpenVDB >= 10.1 (we found ${OpenVDB_VERSION}) can only be used when we build with C++17 or higher. Disabling OpenVDB support.${ColorReset}")
239239
set (OpeVDB_FOUND 0)
240240
endif ()
241241

0 commit comments

Comments
 (0)