From 0f1c484ea9974f9236a66bf9d9799a35f0c1191d Mon Sep 17 00:00:00 2001 From: Letu Ren Date: Wed, 27 Dec 2023 22:26:36 +0800 Subject: [PATCH] Remove deprecated CMake variable CMake variable `CMAKE_COMPILER_IS_CCACHE` is marked as deprecated and "# FIXIT Avoid setting of CMAKE_ variables". It is introduced in https://github.com/opencv/opencv/pull/11167 which is before the release of 4.0. Since it's deprecated almost six years ago, I think it's OK to remove them. Related: https://github.com/opencv/opencv/pull/24771 --- cmake/OpenCVCompilerOptions.cmake | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake index 427189c079..c3715fafb5 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake @@ -1,13 +1,6 @@ if("${CMAKE_CXX_COMPILER};${CMAKE_C_COMPILER};${CMAKE_CXX_COMPILER_LAUNCHER}" MATCHES "ccache") - set(CMAKE_COMPILER_IS_CCACHE 1) # TODO: FIXIT Avoid setting of CMAKE_ variables set(OPENCV_COMPILER_IS_CCACHE 1) endif() -function(access_CMAKE_COMPILER_IS_CCACHE) - if(NOT OPENCV_SUPPRESS_DEPRECATIONS) - message(WARNING "DEPRECATED: CMAKE_COMPILER_IS_CCACHE is replaced to OPENCV_COMPILER_IS_CCACHE.") - endif() -endfunction() -variable_watch(CMAKE_COMPILER_IS_CCACHE access_CMAKE_COMPILER_IS_CCACHE) if(ENABLE_CCACHE AND NOT OPENCV_COMPILER_IS_CCACHE) # This works fine with Unix Makefiles and Ninja generators find_host_program(CCACHE_PROGRAM ccache)