Merge pull request #20507 from alalek:cmake_fix_crosscompilation

4 years ago · ea068dcc2c
parent 5af09e73f2 4ff76cad2a
commit ea068dcc2c
4 changed files with 8 additions and 4 deletions
--- 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})
--- 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})
--- 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")
--- 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