From e68ded8c1cc4cfa8b8f83a90f5c764de0b72c5f2 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Tue, 25 Oct 2022 14:39:20 -0700 Subject: [PATCH] Fix the CMake option for disabling deprecation warnings. (#4946) 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: https://github.com/rapidsai/cuml/pull/4946 --- build.sh | 6 +++--- cpp/cmake/modules/ConfigureCUDA.cmake | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 1c54276aa5..46d2613217 100755 --- a/build.sh +++ b/build.sh @@ -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 @@ -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" @@ -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} \ diff --git a/cpp/cmake/modules/ConfigureCUDA.cmake b/cpp/cmake/modules/ConfigureCUDA.cmake index fd8542cf76..b6c49bb2c2 100644 --- a/cpp/cmake/modules/ConfigureCUDA.cmake +++ b/cpp/cmake/modules/ConfigureCUDA.cmake @@ -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()