Skip to content

Commit

Permalink
Fix the CMake option for disabling deprecation warnings. (rapidsai#4946)
Browse files Browse the repository at this point in the history
The actual option is `DISABLE_DEPRECATION_WARNINGS` but everywhere in the code base is currently making use of `DISABLE_DEPRECATION_WARNING` (note the singular rather than the plural).

Authors:
  - Vyas Ramasubramani (https://github.com/vyasr)

Approvers:
  - Robert Maynard (https://github.com/robertmaynard)

URL: rapidsai#4946
  • Loading branch information
vyasr authored Oct 25, 2022
1 parent 07b4875 commit e68ded8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ CUML_EXTRA_PYTHON_ARGS=${CUML_EXTRA_PYTHON_ARGS:=""}
NVTX=OFF
CCACHE=OFF
CLEAN=0
BUILD_DISABLE_DEPRECATION_WARNING=ON
BUILD_DISABLE_DEPRECATION_WARNINGS=ON
BUILD_CUML_STD_COMMS=ON
BUILD_CUML_TESTS=ON
BUILD_CUML_MG_TESTS=OFF
Expand Down Expand Up @@ -182,7 +182,7 @@ while true; do
NVTX=ON
;;
--show_depr_warn )
BUILD_DISABLE_DEPRECATION_WARNING=OFF
BUILD_DISABLE_DEPRECATION_WARNINGS=OFF
;;
--codecov )
CUML_EXTRA_PYTHON_ARGS="${CUML_EXTRA_PYTHON_ARGS} --linetrace=1 --profile"
Expand Down Expand Up @@ -257,7 +257,7 @@ if completeBuild || hasArg libcuml || hasArg prims || hasArg bench || hasArg pri
-DCUML_USE_TREELITE_STATIC=${BUILD_STATIC_TREELITE} \
-DNVTX=${NVTX} \
-DUSE_CCACHE=${CCACHE} \
-DDISABLE_DEPRECATION_WARNING=${BUILD_DISABLE_DEPRECATION_WARNING} \
-DDISABLE_DEPRECATION_WARNINGS=${BUILD_DISABLE_DEPRECATION_WARNINGS} \
-DCMAKE_PREFIX_PATH=${INSTALL_PREFIX} \
-DCMAKE_MESSAGE_LOG_LEVEL=${CMAKE_LOG_LEVEL} \
${CUML_EXTRA_CMAKE_ARGS} \
Expand Down
2 changes: 1 addition & 1 deletion cpp/cmake/modules/ConfigureCUDA.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ if(CMAKE_CUDA_COMPILER_VERSION VERSION_GREATER_EQUAL 11.2.0)
endif()
list(APPEND CUML_CUDA_FLAGS -Xcompiler=-Wall,-Werror,-Wno-error=deprecated-declarations,-Wno-error=sign-compare)

if(DISABLE_DEPRECATION_WARNING)
if(DISABLE_DEPRECATION_WARNINGS)
list(APPEND CUML_CXX_FLAGS -Wno-deprecated-declarations)
list(APPEND CUML_CUDA_FLAGS -Wno-deprecated-declarations -Xcompiler=-Wno-deprecated-declarations)
endif()
Expand Down

0 comments on commit e68ded8

Please sign in to comment.