Skip to content

Commit 4bdc995

Browse files
authored
Merge pull request #1093 from Idclip/turn_on_dep_warns
Turn on warnings for upcoming deprecations
2 parents 8548fad + d96a732 commit 4bdc995

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ paths provided through the Xxx_ROOT, supported XXX_INCLUDEDIR/XXX_LIBRARYDIR var
124124
list will be searched.]=] OFF)
125125
option(OPENVDB_USE_DEPRECATED_ABI_6 "Bypass minimum ABI requirement checks" OFF)
126126
option(OPENVDB_USE_FUTURE_ABI_9 "Bypass future ABI check" OFF)
127-
option(OPENVDB_FUTURE_DEPRECATION "Generate messages for upcoming deprecation" OFF)
127+
option(OPENVDB_FUTURE_DEPRECATION "Generate messages for upcoming deprecation" ON)
128128
option(OPENVDB_ENABLE_UNINSTALL "Adds a CMake uninstall target." ON)
129129
option(USE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." OFF)
130130
option(USE_PKGCONFIG "Use pkg-config to search for dependent libraries." ON)

openvdb/openvdb/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,9 @@ endif()
114114

115115
find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS iostreams system)
116116
if(OPENVDB_FUTURE_DEPRECATION AND FUTURE_MINIMUM_BOOST_VERSION)
117-
if(${Boost_LIB_VERSION} VERSION_LESS FUTURE_MINIMUM_BOOST_VERSION)
117+
# The X.Y.Z boost version value isn't available until CMake 3.14
118+
set(FULL_BOOST_VERSION "${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_SUBMINOR_VERSION}")
119+
if(${FULL_BOOST_VERSION} VERSION_LESS FUTURE_MINIMUM_BOOST_VERSION)
118120
message(DEPRECATION "Support for Boost versions < ${FUTURE_MINIMUM_BOOST_VERSION} "
119121
"is deprecated and will be removed.")
120122
endif()

pendingchanges/dep_warnings.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Build:
2+
- Enabled the OPENVDB_FUTURE_DEPRECATION variable by default to warn on upcoming deprecations.

0 commit comments

Comments
 (0)