From 4ff76cad2a0b204a43ec4d57aebe65aa2a616543 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 5 Aug 2021 11:42:58 +0000 Subject: [PATCH] cmake: fix cross-compilation problems - unexpected pkg-config module (we should not use host binary) - bump cmake_minimum_required to 3.5 in toolchain files --- modules/highgui/cmake/init.cmake | 4 +++- modules/videoio/cmake/init.cmake | 4 +++- platforms/linux/gnu.toolchain.cmake | 2 +- platforms/linux/riscv.toolchain.cmake | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/modules/highgui/cmake/init.cmake b/modules/highgui/cmake/init.cmake index a302c4d..2002ff0 100644 --- a/modules/highgui/cmake/init.cmake +++ b/modules/highgui/cmake/init.cmake @@ -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}) diff --git a/modules/videoio/cmake/init.cmake b/modules/videoio/cmake/init.cmake index 6883879..af664f9 100644 --- a/modules/videoio/cmake/init.cmake +++ b/modules/videoio/cmake/init.cmake @@ -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}) diff --git a/platforms/linux/gnu.toolchain.cmake b/platforms/linux/gnu.toolchain.cmake index cba08e7..64258e6 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 3.5) # load settings in case of "try compile" set(TOOLCHAIN_CONFIG_FILE "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/toolchain.config.cmake") diff --git a/platforms/linux/riscv.toolchain.cmake b/platforms/linux/riscv.toolchain.cmake index 2a69d7e..cea80bd 100644 --- a/platforms/linux/riscv.toolchain.cmake +++ b/platforms/linux/riscv.toolchain.cmake @@ -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 -- 2.7.4