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

Merge pull request #20507 from alalek:cmake_fix_crosscompilation

Browse Source
This commit is contained in:
Alexander Alekhin 2021-08-05 15:38:02 +00:00
commit ea068dcc2c
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/highgui/cmake/init.cmake
View File

@ -25,7 +25,9 @@ endif()
# Detect available dependencies
#
include(FindPkgConfig)
if(NOT PROJECT_NAME STREQUAL "OpenCV")
include(FindPkgConfig)
endif()
macro(add_backend backend_id cond_var)
if(${cond_var})

4
modules/videoio/cmake/init.cmake
View File

@ -1,4 +1,6 @@
include(FindPkgConfig)
if(NOT PROJECT_NAME STREQUAL "OpenCV")
include(FindPkgConfig)
endif()
macro(add_backend backend_id cond_var)
if(${cond_var})

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

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

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

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.5)
if(COMMAND toolchain_save_config)
return() # prevent recursive call