mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-29 08:00:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: raise min cmake version to 3.13 in other places

Browse Source
This commit is contained in:
Maksim Shabunin 2024-10-29 17:17:27 +03:00
parent 66a29b422c
commit e44e3ab0a7
23 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -15,15 +15,7 @@ endif()
include(cmake/OpenCVMinDepVersions.cmake) include(cmake/OpenCVMinDepVersions.cmake)
if(CMAKE_SYSTEM_NAME MATCHES WindowsPhone OR CMAKE_SYSTEM_NAME MATCHES WindowsStore)
cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
#Required to resolve linker error issues due to incompatibility with CMake v3.0+ policies.
#CMake fails to find _fseeko() which leads to subsequent linker error.
#See details here: http://www.cmake.org/Wiki/CMake/Policies
cmake_policy(VERSION 2.8)
else()
cmake_minimum_required(VERSION "${MIN_VER_CMAKE}" FATAL_ERROR) cmake_minimum_required(VERSION "${MIN_VER_CMAKE}" FATAL_ERROR)
endif()
# #
# Configure CMake policies # Configure CMake policies

2
cmake/OpenCVGenPkgconfig.cmake
View File

@ -110,7 +110,7 @@ endif()
# ============================================================================= # =============================================================================
else() # DEFINED CMAKE_HELPER_SCRIPT else() # DEFINED CMAKE_HELPER_SCRIPT
cmake_minimum_required(VERSION 2.8.12.2) cmake_minimum_required(VERSION 3.13)
cmake_policy(SET CMP0012 NEW) cmake_policy(SET CMP0012 NEW)
include("${CMAKE_HELPER_SCRIPT}") include("${CMAKE_HELPER_SCRIPT}")
include("${OpenCV_SOURCE_DIR}/cmake/OpenCVUtils.cmake") include("${OpenCV_SOURCE_DIR}/cmake/OpenCVUtils.cmake")

2
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.markdown
View File

@ -61,7 +61,7 @@ int main(int argc, char** argv )
Now you have to create your CMakeLists.txt file. It should look like this: Now you have to create your CMakeLists.txt file. It should look like this:
@code{.cmake} @code{.cmake}
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 3.13)
project( DisplayImage ) project( DisplayImage )
find_package( OpenCV REQUIRED ) find_package( OpenCV REQUIRED )
include_directories( ${OpenCV_INCLUDE_DIRS} ) include_directories( ${OpenCV_INCLUDE_DIRS} )

2
modules/core/misc/plugins/parallel_openmp/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.13)
project(opencv_core_parallel_openmp CXX) project(opencv_core_parallel_openmp CXX)
get_filename_component(OpenCV_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../../.." ABSOLUTE) get_filename_component(OpenCV_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../../.." ABSOLUTE)

2
modules/core/misc/plugins/parallel_tbb/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.13)
project(opencv_core_parallel_tbb CXX) project(opencv_core_parallel_tbb CXX)
get_filename_component(OpenCV_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../../.." ABSOLUTE) get_filename_component(OpenCV_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../../.." ABSOLUTE)

2
modules/gapi/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# FIXME: Rework standalone build in more generic maner # FIXME: Rework standalone build in more generic maner
# (Restructure directories, add common pass, etc) # (Restructure directories, add common pass, etc)
if(NOT DEFINED OPENCV_INITIAL_PASS) if(NOT DEFINED OPENCV_INITIAL_PASS)
cmake_minimum_required(VERSION 3.3) cmake_minimum_required(VERSION 3.13)
project(gapi_standalone) project(gapi_standalone)
include("cmake/standalone.cmake") include("cmake/standalone.cmake")
return() return()

2
modules/highgui/misc/plugins/plugin_gtk/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.13)
project(opencv_highgui_gtk) project(opencv_highgui_gtk)
get_filename_component(OpenCV_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../../.." ABSOLUTE) get_filename_component(OpenCV_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../../.." ABSOLUTE)

2
modules/java/android_sdk/libcxx_helper/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.6) cmake_minimum_required(VERSION 3.13)
project(opencv_jni_shared) project(opencv_jni_shared)

2
modules/python/CMakeLists.txt
View File

@ -25,7 +25,7 @@ add_subdirectory(python3)
else() # standalone build else() # standalone build
cmake_minimum_required(VERSION 2.8.12.2) cmake_minimum_required(VERSION 3.13)
project(OpenCVPython CXX C) project(OpenCVPython CXX C)
include("./standalone.cmake") include("./standalone.cmake")

2
modules/videoio/misc/plugin_ffmpeg/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.13)
get_filename_component(OpenCV_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../.." ABSOLUTE) get_filename_component(OpenCV_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../.." ABSOLUTE)
include("${OpenCV_SOURCE_DIR}/cmake/OpenCVPluginStandalone.cmake") include("${OpenCV_SOURCE_DIR}/cmake/OpenCVPluginStandalone.cmake")

2
modules/videoio/misc/plugin_gstreamer/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.13)
get_filename_component(OpenCV_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../.." ABSOLUTE) get_filename_component(OpenCV_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../.." ABSOLUTE)
include("${OpenCV_SOURCE_DIR}/cmake/OpenCVPluginStandalone.cmake") include("${OpenCV_SOURCE_DIR}/cmake/OpenCVPluginStandalone.cmake")

2
platforms/android/aar-template/OpenCV/src/main/cpp/CMakeLists.txt.template
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.6) cmake_minimum_required(VERSION 3.13)
project("opencv") project("opencv")

2
platforms/android/build-tests/test_cmake_build.py
View File

@ -7,7 +7,7 @@ import logging as log
log.basicConfig(format='%(message)s', level=log.DEBUG) log.basicConfig(format='%(message)s', level=log.DEBUG)
CMAKE_TEMPLATE='''\ CMAKE_TEMPLATE='''\
CMAKE_MINIMUM_REQUIRED(VERSION 2.8) CMAKE_MINIMUM_REQUIRED(VERSION 3.13)
# Enable C++17 # Enable C++17
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)

2
platforms/linux/gnu.toolchain.cmake
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.13)
# load settings in case of "try compile" # load settings in case of "try compile"
set(TOOLCHAIN_CONFIG_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/toolchain.config.cmake") set(TOOLCHAIN_CONFIG_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/toolchain.config.cmake")

2
samples/CMakeLists.example.in
View File

@ -1,5 +1,5 @@
# cmake needs this line # cmake needs this line
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.13)
if(NOT DEFINED EXAMPLE_NAME) if(NOT DEFINED EXAMPLE_NAME)
message(FATAL_ERROR "Invalid build script: missing EXAMPLE_NAME") message(FATAL_ERROR "Invalid build script: missing EXAMPLE_NAME")

2
samples/CMakeLists.txt
View File

@ -59,7 +59,7 @@ else()
# Standalone mode # Standalone mode
# #
#=================================================================================================== #===================================================================================================
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.13)
project(samples C CXX) project(samples C CXX)
option(BUILD_EXAMPLES "Build samples" ON) option(BUILD_EXAMPLES "Build samples" ON)

2
samples/android/tutorial-2-mixedprocessing/jni/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.6) cmake_minimum_required(VERSION 3.13)
set(target mixed_sample) set(target mixed_sample)
project(${target} CXX) project(${target} CXX)

2
samples/android/tutorial-4-opencl/jni/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.6) cmake_minimum_required(VERSION 3.13)
set(target JNIpart) set(target JNIpart)
project(${target} CXX) project(${target} CXX)

2
samples/cpp/example_cmake/CMakeLists.txt
View File

@ -1,5 +1,5 @@
# cmake needs this line # cmake needs this line
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.13)
# Define project name # Define project name
project(opencv_example_project) project(opencv_example_project)

2
samples/cpp/tutorial_code/core/parallel_backend/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.9) cmake_minimum_required(VERSION 3.13)
find_package(OpenCV REQUIRED COMPONENTS opencv_core) find_package(OpenCV REQUIRED COMPONENTS opencv_core)

2
samples/cpp/tutorial_code/gpu/gpu-thrust-interop/CMakeLists.txt
View File

@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.8) CMAKE_MINIMUM_REQUIRED(VERSION 3.13)
FIND_PACKAGE(CUDA REQUIRED) FIND_PACKAGE(CUDA REQUIRED)
INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${CUDA_INCLUDE_DIRS})

2
samples/hal/c_hal/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR) cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
set(PROJECT_NAME "c_hal") set(PROJECT_NAME "c_hal")
set(HAL_LIB_NAME "c_hal") set(HAL_LIB_NAME "c_hal")

2
samples/hal/slow_hal/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR) cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
set(PROJECT_NAME "slow_hal") set(PROJECT_NAME "slow_hal")
set(HAL_LIB_NAME "slow_hal") set(HAL_LIB_NAME "slow_hal")