Skip to content

Commit c37ea13

Browse files
authored
fix: x265 compile issue and ios min sdk not defined issue
1 parent 3d68e2e commit c37ea13

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

ios.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if [[ -f ${XCODE_FOR_FFMPEG_KIT} ]]; then
2828
fi
2929

3030
# DETECT IOS SDK VERSION
31-
export DETECTED_IOS_SDK_VERSION="$(xcrun --sdk iphoneos --show-sdk-version 2>>${BASEDIR}/build.log)"
31+
export DETECTED_IOS_SDK_VERSION="$(xcrun --sdk iphoneos --show-sdk-version 2>>"${BASEDIR}/build.log")"
3232
echo -e "\nINFO: Using SDK ${DETECTED_IOS_SDK_VERSION} by Xcode provided at $(xcode-select -p)\n" 1>>"${BASEDIR}"/build.log 2>&1
3333
echo -e "INFO: Build options: $*\n" 1>>"${BASEDIR}"/build.log 2>&1
3434

tools/patch/cmake/x265/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ if(NOT CMAKE_BUILD_TYPE)
77
endif()
88
message(STATUS "cmake version ${CMAKE_VERSION}")
99
if(POLICY CMP0025)
10-
cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
10+
cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang
1111
endif()
1212
if(POLICY CMP0042)
1313
cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
1414
endif()
1515
if(POLICY CMP0054)
16-
cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted
16+
cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted
1717
endif()
1818

1919
project (x265)
20-
cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
20+
cmake_minimum_required (VERSION 3.5) # OBJECT libraries require 2.8.8
2121
include(CheckIncludeFiles)
2222
include(CheckFunctionExists)
2323
include(CheckSymbolExists)

0 commit comments

Comments
 (0)