Pārlūkot izejas kodu

Script updates for NvCloth-v1.1.6-4-gd243404-pr58 on Linux aarch64 (ARM64) (#156)

Signed-off-by: Steve Pham <[email protected]>
Steve Pham 2 gadi atpakaļ
vecāks
revīzija
4e0329d3a4

+ 14 - 3
package-system/NvCloth/build_package_image.py

@@ -220,22 +220,33 @@ def main():
     parser.add_argument(
         '--platform-name',
         dest='platformName',
-        choices=['windows', 'linux', 'android', 'mac', 'ios'],
+        choices=['windows', 'linux', 'linux-aarch64', 'android', 'mac', 'ios'],
         default=VcpkgBuilder.defaultPackagePlatformName(),
     )
     args = parser.parse_args()
+    vcpkg_platform_map = {
+            'windows': 'windows',
+            'android': 'android',
+            'mac': 'mac',
+            'ios': 'ios',
+            'linux': 'linux',
+            'linux-aarch64': 'linux' }
+
+    vcpkg_platform = vcpkg_platform_map[args.platformName]
+    if args.platformName == 'linux-aarch64':
+        os.environ['VCPKG_FORCE_SYSTEM_BINARIES'] = '1'
 
     packageSystemDir = Path(__file__).resolve().parents[1]
     packageSourceDir = packageSystemDir / 'NvCloth'
     packageRoot = packageSystemDir / f'NvCloth-{args.platformName}'
 
-    cmakeFindFile = packageSourceDir / f'FindNvCloth_{args.platformName}.cmake'
+    cmakeFindFile = packageSourceDir / f'FindNvCloth_{vcpkg_platform}.cmake'
     if not cmakeFindFile.exists():
         cmakeFindFile = packageSourceDir / 'FindNvCloth.cmake'
 
     with TemporaryDirectory() as tempdir:
         tempdir = Path(tempdir)
-        builder = NvClothBuilder(workingDir=tempdir, basePackageSystemDir=packageSystemDir, targetPlatform=args.platformName)
+        builder = NvClothBuilder(workingDir=tempdir, basePackageSystemDir=packageSystemDir, targetPlatform=vcpkg_platform)
         builder.clone('8e100cca5888d09f40f4721cc433f284b1841e65')
         builder.build()
         builder.copyBuildOutputTo(packageRoot/'NvCloth')

+ 2 - 0
package_build_list_host_linux-aarch64.json

@@ -19,6 +19,7 @@
         "lz4-1.9.3-vcpkg-rev4-linux-aarch64": "package-system/lz4/build_package_image.py --platform-name linux-aarch64",
         "mcpp-2.7.2_az.1-rev1-linux-aarch64": "package-system/mcpp/get_and_build_mcpp.py mcpp-2.7.2_az.1-rev1",
         "mikkelsen-1.0.0.4-linux-aarch64": "package-system/mikkelsen/build_package_image.py --platform linux-aarch64",
+        "NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux-aarch64": "package-system/NvCloth/build_package_image.py --platform-name linux-aarch64",
         "OpenEXR-3.1.3-rev4-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenEXR --platform-name Linux-aarch64 --clean",
         "OpenMesh-8.1-rev3-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenMesh --platform-name Linux-aarch64 --clean",
         "OpenXR-1.0.22-rev2-linux-aarch64": "Scripts/extras/pull_and_build_from_git.py ../../package-system/OpenXR --platform-name Linux-aarch64 --clean",
@@ -45,6 +46,7 @@
         "lz4-1.9.3-vcpkg-rev4-linux-aarch64": "package-system/lz4-linux-aarch64",
         "mikkelsen-1.0.0.4-linux-aarch64": "package-system/mikkelsen-linux-aarch64",
         "mcpp-2.7.2_az.1-rev1-linux-aarch64": "package-system/mcpp-linux-aarch64",
+        "NvCloth-v1.1.6-4-gd243404-pr58-rev1-linux-aarch64": "package-system/NvCloth-linux-aarch64",
         "OpenEXR-3.1.3-rev4-linux-aarch64": "package-system/OpenEXR/temp/OpenEXR-linux-aarch64",
         "OpenMesh-8.1-rev3-linux-aarch64": "package-system/OpenMesh/temp/OpenMesh-linux-aarch64",
         "OpenXR-1.0.22-rev2-linux-aarch64": "package-system/OpenXR/temp/OpenXR-linux-aarch64",