]> granicus.if.org Git - handbrake/commitdiff
x265: set CMAKE_HOST_SYSTEM instead of just removing --build.
authorRodeo <tdskywalker@gmail.com>
Thu, 13 Mar 2014 02:17:20 +0000 (02:17 +0000)
committerRodeo <tdskywalker@gmail.com>
Thu, 13 Mar 2014 02:17:20 +0000 (02:17 +0000)
Inetrestingly, host/build seems inverted in cmake compared
to autotools (and actually matches our build system).

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6108 b64f7644-9d1e-0410-96f1-a4d463321fa5

contrib/x265/module.defs

index 8269044367bba365d2ab9df511ad2cbef200e2bd..0d74842b4ca35103a5b1d4b735d9f42bbe49a966 100644 (file)
@@ -5,16 +5,16 @@ X265.FETCH.url = http://download.handbrake.fr/contrib/x265-6321-8a84c10e5116.tar
 
 X265.CONFIGURE.exe         = cmake
 X265.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265.CONFIGURE.prefix)"
-X265.CONFIGURE.build       =
 X265.CONFIGURE.deps        =
 X265.CONFIGURE.static      =
 X265.CONFIGURE.shared      = -DENABLE_SHARED=OFF
 X265.CONFIGURE.extra       = -DENABLE_CLI=OFF -DHIGH_BIT_DEPTH=OFF
 
 ifeq (1,$(BUILD.cross))
-    X265.CONFIGURE.args.host = -DCMAKE_SYSTEM_NAME="$(X265.CONFIGURE.host)"
+    X265.CONFIGURE.args.host  = -DCMAKE_SYSTEM_NAME="$(X265.CONFIGURE.host)"
+    X265.CONFIGURE.args.build = -DCMAKE_HOST_SYSTEM="$(X265.CONFIGURE.build)"
 else
-    X265.CONFIGURE.args.host = -DCMAKE_HOST_SYSTEM="$(X265.CONFIGURE.host)"
+    X265.CONFIGURE.args.host  = -DCMAKE_HOST_SYSTEM="$(X265.CONFIGURE.host)"
     ifeq (1,$(FEATURE.local_yasm))
         X265.CONFIGURE.env.LOCAL_PATH = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"
         X265.BUILD.env                = PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)"