mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
parent
fbb28d7f50
commit
9b727a9095
@ -0,0 +1,89 @@
|
|||||||
|
From b354c009a60bcd6d7fc04014e200a1ee9c45c167 Mon Sep 17 00:00:00 2001
|
||||||
|
From: yaswanthsastry <yaswanth.sastry@multicorewareinc.com>
|
||||||
|
Date: Mon, 24 Feb 2025 17:07:03 +0530
|
||||||
|
Subject: [PATCH] Fix CMake build error with latest CMake 4.0 release
|
||||||
|
|
||||||
|
---
|
||||||
|
source/CMakeLists.txt | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
|
||||||
|
index 37dbe1a87..4f5b3ed82 100755
|
||||||
|
--- a/source/CMakeLists.txt
|
||||||
|
+++ b/source/CMakeLists.txt
|
||||||
|
@@ -7,13 +7,13 @@ if(NOT CMAKE_BUILD_TYPE)
|
||||||
|
endif()
|
||||||
|
message(STATUS "cmake version ${CMAKE_VERSION}")
|
||||||
|
if(POLICY CMP0025)
|
||||||
|
- cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
|
||||||
|
+ cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang
|
||||||
|
endif()
|
||||||
|
if(POLICY CMP0042)
|
||||||
|
cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
|
||||||
|
endif()
|
||||||
|
if(POLICY CMP0054)
|
||||||
|
- cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted
|
||||||
|
+ cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted
|
||||||
|
endif()
|
||||||
|
|
||||||
|
project (x265)
|
||||||
|
--
|
||||||
|
2.48.1
|
||||||
|
|
||||||
|
From 51ae8e922bcc4586ad4710812072289af91492a8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: yaswanthsastry <yaswanth.sastry@multicorewareinc.com>
|
||||||
|
Date: Mon, 7 Apr 2025 11:27:36 +0530
|
||||||
|
Subject: [PATCH] Fix for CMake Build Errors in MacOS
|
||||||
|
|
||||||
|
---
|
||||||
|
source/CMakeLists.txt | 15 +++++++--------
|
||||||
|
1 file changed, 7 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
|
||||||
|
index 4f5b3ed82..7183fd3ce 100755
|
||||||
|
--- a/source/CMakeLists.txt
|
||||||
|
+++ b/source/CMakeLists.txt
|
||||||
|
@@ -6,18 +6,14 @@ if(NOT CMAKE_BUILD_TYPE)
|
||||||
|
FORCE)
|
||||||
|
endif()
|
||||||
|
message(STATUS "cmake version ${CMAKE_VERSION}")
|
||||||
|
-if(POLICY CMP0025)
|
||||||
|
- cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang
|
||||||
|
-endif()
|
||||||
|
+
|
||||||
|
if(POLICY CMP0042)
|
||||||
|
cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
|
||||||
|
endif()
|
||||||
|
-if(POLICY CMP0054)
|
||||||
|
- cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted
|
||||||
|
-endif()
|
||||||
|
+
|
||||||
|
|
||||||
|
project (x265)
|
||||||
|
-cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
|
||||||
|
+cmake_minimum_required (VERSION 2.8.8...3.10) # OBJECT libraries require 2.8.8
|
||||||
|
include(CheckIncludeFiles)
|
||||||
|
include(CheckFunctionExists)
|
||||||
|
include(CheckSymbolExists)
|
||||||
|
@@ -168,7 +164,7 @@ if(APPLE)
|
||||||
|
add_definitions(-DMACOS=1)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
-if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
|
||||||
|
+if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang")
|
||||||
|
set(CLANG 1)
|
||||||
|
endif()
|
||||||
|
if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")
|
||||||
|
@@ -740,6 +736,9 @@ if((MSVC_IDE OR XCODE OR GCC) AND ENABLE_ASSEMBLY)
|
||||||
|
if(ARM OR CROSS_COMPILE_ARM)
|
||||||
|
# compile ARM arch asm files here
|
||||||
|
enable_language(ASM)
|
||||||
|
+ if(APPLE)
|
||||||
|
+ set(ARM_ARGS ${ARM_ARGS} -arch ${CMAKE_OSX_ARCHITECTURES})
|
||||||
|
+ endif()
|
||||||
|
foreach(ASM ${ARM_ASMS})
|
||||||
|
set(ASM_SRC ${CMAKE_CURRENT_SOURCE_DIR}/common/arm/${ASM})
|
||||||
|
list(APPEND ASM_SRCS ${ASM_SRC})
|
||||||
|
--
|
||||||
|
2.48.1
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user