Skip to content

Commit 872500c

Browse files
committed
Merge pull request opencv#10193 from alalek:fix_ios_cmake_3.10
2 parents cc2ee92 + cdc2aca commit 872500c

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

platforms/ios/cmake/Toolchains/common-ios-toolchain.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,13 @@ endif()
9292

9393
if(NOT __IN_TRY_COMPILE)
9494
set(_xcodebuild_wrapper "${CMAKE_BINARY_DIR}/xcodebuild_wrapper")
95+
if(NOT DEFINED CMAKE_MAKE_PROGRAM) # empty since CMake 3.10
96+
find_program(XCODEBUILD_PATH "xcodebuild")
97+
if(NOT XCODEBUILD_PATH)
98+
message(FATAL_ERROR "Specify CMAKE_MAKE_PROGRAM variable ('xcodebuild' absolute path)")
99+
endif()
100+
set(CMAKE_MAKE_PROGRAM "${XCODEBUILD_PATH}")
101+
endif()
95102
if(NOT CMAKE_MAKE_PROGRAM STREQUAL _xcodebuild_wrapper)
96103
if(APPLE_FRAMEWORK AND BUILD_SHARED_LIBS)
97104
set(_xcodebuild_wrapper_tmp "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/xcodebuild_wrapper")

0 commit comments

Comments
 (0)