summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Storsjö <[email protected]>2020-02-13 21:41:46 +0200
committerScott <[email protected]>2020-03-14 21:14:57 +0000
commit3c53140e19739c1a4247de64569b3f7db8db5af6 (patch)
treea2779209b2b5ef08c4be8db1aede62d83c5d093d
parent45f4623f5d04d905fa1251be92a8f1acb261e983 (diff)
contrib: x265: Set CMAKE_SYSTEM_PROCESSOR
This is necessary when cross compiling.
-rw-r--r--contrib/x265_10bit/module.defs1
-rw-r--r--contrib/x265_12bit/module.defs1
-rw-r--r--contrib/x265_8bit/module.defs1
3 files changed, 3 insertions, 0 deletions
diff --git a/contrib/x265_10bit/module.defs b/contrib/x265_10bit/module.defs
index 56a8ebf15..5c45c3705 100644
--- a/contrib/x265_10bit/module.defs
+++ b/contrib/x265_10bit/module.defs
@@ -52,6 +52,7 @@ ifeq (1,$(HOST.cross))
X265_10.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(X265_10.CONFIGURE.host)"
endif
X265_10.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_10.CONFIGURE.build)"
+ X265_10.CONFIGURE.extra += -DCMAKE_SYSTEM_PROCESSOR=$(HOST.machine)
else
X265_10.CONFIGURE.args.host = -DCMAKE_HOST_SYSTEM="$(X265_10.CONFIGURE.host)"
endif
diff --git a/contrib/x265_12bit/module.defs b/contrib/x265_12bit/module.defs
index ee6eab4de..33cac29d3 100644
--- a/contrib/x265_12bit/module.defs
+++ b/contrib/x265_12bit/module.defs
@@ -52,6 +52,7 @@ ifeq (1,$(HOST.cross))
X265_12.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(X265_12.CONFIGURE.host)"
endif
X265_12.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_12.CONFIGURE.build)"
+ X265_12.CONFIGURE.extra += -DCMAKE_SYSTEM_PROCESSOR=$(HOST.machine)
else
X265_12.CONFIGURE.args.host = -DCMAKE_HOST_SYSTEM="$(X265_12.CONFIGURE.host)"
endif
diff --git a/contrib/x265_8bit/module.defs b/contrib/x265_8bit/module.defs
index a88d48843..f3fdf8183 100644
--- a/contrib/x265_8bit/module.defs
+++ b/contrib/x265_8bit/module.defs
@@ -49,6 +49,7 @@ ifeq (1,$(HOST.cross))
X265_8.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(X265_8.CONFIGURE.host)"
endif
X265_8.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265_8.CONFIGURE.build)"
+ X265_8.CONFIGURE.extra += -DCMAKE_SYSTEM_PROCESSOR=$(HOST.machine)
else
X265_8.CONFIGURE.args.host = -DCMAKE_HOST_SYSTEM="$(X265_8.CONFIGURE.host)"
endif