From 87ef6a9cc13749a3fba918350ffd97ce06753d80 Mon Sep 17 00:00:00 2001 From: Tomoaki Teshima Date: Tue, 12 Jul 2022 19:42:39 +0900 Subject: [PATCH] build: suppress the warning DRY bump the version --- 3rdparty/carotene/CMakeLists.txt | 2 +- 3rdparty/carotene/hal/CMakeLists.txt | 2 +- cmake/OpenCVDetectHalide.cmake | 2 +- modules/python/CMakeLists.txt | 2 +- platforms/android/android.toolchain.cmake | 2 +- platforms/linux/gnu.toolchain.cmake | 2 +- samples/CMakeLists.txt | 2 +- samples/cpp/example_cmake/CMakeLists.txt | 2 +- samples/hal/c_hal/CMakeLists.txt | 2 +- samples/hal/slow_hal/CMakeLists.txt | 2 +- samples/openvx/CMakeLists.txt | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/3rdparty/carotene/CMakeLists.txt b/3rdparty/carotene/CMakeLists.txt index bd26a2d7ef..3d49a2def6 100644 --- a/3rdparty/carotene/CMakeLists.txt +++ b/3rdparty/carotene/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.11 FATAL_ERROR) +cmake_minimum_required(VERSION ${MIN_VER_CMAKE} FATAL_ERROR) project(Carotene) diff --git a/3rdparty/carotene/hal/CMakeLists.txt b/3rdparty/carotene/hal/CMakeLists.txt index 0162aae101..6f209981a6 100644 --- a/3rdparty/carotene/hal/CMakeLists.txt +++ b/3rdparty/carotene/hal/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) +cmake_minimum_required(VERSION ${MIN_VER_CMAKE} FATAL_ERROR) include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) diff --git a/cmake/OpenCVDetectHalide.cmake b/cmake/OpenCVDetectHalide.cmake index 4828c299ae..dc484a7d3d 100644 --- a/cmake/OpenCVDetectHalide.cmake +++ b/cmake/OpenCVDetectHalide.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION ${MIN_VER_CMAKE}) if(" ${HALIDE_ROOT_DIR}" STREQUAL " ") unset(HALIDE_ROOT_DIR CACHE) diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt index a51acf386e..990156074a 100644 --- a/modules/python/CMakeLists.txt +++ b/modules/python/CMakeLists.txt @@ -40,7 +40,7 @@ add_subdirectory(python3) else() # standalone build -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 2.8.12.2) project(OpenCVPython CXX C) include("./standalone.cmake") diff --git a/platforms/android/android.toolchain.cmake b/platforms/android/android.toolchain.cmake index 50b342c7a6..1dca060fdf 100644 --- a/platforms/android/android.toolchain.cmake +++ b/platforms/android/android.toolchain.cmake @@ -189,7 +189,7 @@ # # ------------------------------------------------------------------------------ -cmake_minimum_required( VERSION 2.6.3 ) +cmake_minimum_required( VERSION 2.8.12.2 ) if( DEFINED CMAKE_CROSSCOMPILING ) # subsequent toolchain loading is not really needed diff --git a/platforms/linux/gnu.toolchain.cmake b/platforms/linux/gnu.toolchain.cmake index cba08e7fbb..d8f6c571ca 100644 --- a/platforms/linux/gnu.toolchain.cmake +++ b/platforms/linux/gnu.toolchain.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.12.2) # load settings in case of "try compile" set(TOOLCHAIN_CONFIG_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/toolchain.config.cmake") diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 68afc487a2..bc8d5097ef 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -56,7 +56,7 @@ else() # Standalone mode # #=================================================================================================== -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.12.2) project(samples C CXX) option(BUILD_EXAMPLES "Build samples" ON) diff --git a/samples/cpp/example_cmake/CMakeLists.txt b/samples/cpp/example_cmake/CMakeLists.txt index c669660cef..fb8000ae24 100644 --- a/samples/cpp/example_cmake/CMakeLists.txt +++ b/samples/cpp/example_cmake/CMakeLists.txt @@ -1,5 +1,5 @@ # cmake needs this line -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.8.12.2) # Define project name project(opencv_example_project) diff --git a/samples/hal/c_hal/CMakeLists.txt b/samples/hal/c_hal/CMakeLists.txt index 8502779e84..8cf78aa5ff 100644 --- a/samples/hal/c_hal/CMakeLists.txt +++ b/samples/hal/c_hal/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) +cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR) set(PROJECT_NAME "c_hal") set(HAL_LIB_NAME "c_hal") diff --git a/samples/hal/slow_hal/CMakeLists.txt b/samples/hal/slow_hal/CMakeLists.txt index d42fb0b6fd..1ffa4670b6 100644 --- a/samples/hal/slow_hal/CMakeLists.txt +++ b/samples/hal/slow_hal/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR) +cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR) set(PROJECT_NAME "slow_hal") set(HAL_LIB_NAME "slow_hal") diff --git a/samples/openvx/CMakeLists.txt b/samples/openvx/CMakeLists.txt index 701184d369..fd04e6b9e2 100644 --- a/samples/openvx/CMakeLists.txt +++ b/samples/openvx/CMakeLists.txt @@ -1,6 +1,6 @@ ocv_install_example_src(cpp *.cpp *.hpp CMakeLists.txt) -cmake_minimum_required(VERSION 2.8.9) +cmake_minimum_required(VERSION 2.8.12.2) set(OPENCV_OPENVX_SAMPLE_REQUIRED_DEPS opencv_core