Merge pull request #807 from overte-org/JulianGro-vcpkg_aarch64_update

Update VCPKG for Linux aarch64

hifi_vcpkg.py

@@ -108,8 +108,8 @@ def __init__(self, args):
         elif 'Linux' == system and 'aarch64' == machine:
             self.exe = os.path.join(self.path, 'vcpkg')
             self.bootstrapCmds = [ os.path.join(self.path, 'bootstrap-vcpkg.sh'), '-disableMetrics' ]
-            self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/vcpkg-linux_aarch64_2022.07.25.tar.xz'
-            self.vcpkgHash = '7abb7aa96200e3cb5a6d0ec1c6ee63aa7886df2d1fecf8f9ee41ebe4d2cea0d4143274222c4941cb7aca61e4048229fdfe9eb2cd36dd559dd26db871a3b3ed61'
+            self.vcpkgUrl = self.assets_url + '/dependencies/vcpkg/vcpkg-linux_aarch64_2024.01.12.tar.xz'
+            self.vcpkgHash = '222d82079f0e087b9978f4446dd2b11e19db3bbbaa3aac0de4710732d64f1d55fb506fc5b8979a61ab13834028e2141aa49a79ed83c0fb03b87944c707d2f2d3'
             self.hostTriplet = 'arm64-linux'
         else:
             self.exe = os.path.join(self.path, 'vcpkg')

plugins/CMakeLists.txt

@@ -1,9 +1,10 @@
 #
 #  Created by Bradley Austin Davis on 2015/10/25
 #  Copyright 2015 High Fidelity, Inc.
+#  Copyright 2023-2024 Overte e.V.
 #
 #  Distributed under the Apache License, Version 2.0.
-#  See the accompanying file LICENSE or http:#www.apache.org/licenses/LICENSE-2.0.html
+#  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 #
 
 # add the plugin directories
@@ -19,9 +20,11 @@ if (NOT SERVER_ONLY AND NOT ANDROID)
       add_subdirectory(${DIR})
   endif()
 
-  # Note: OpenVR is a Steam thing, which is different from OVR, which is an Oculus SDK component.
-  set(DIR "openvr")
-  add_subdirectory(${DIR})
+  if (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+    # Note: OpenVR is a Steam thing, which is different from OVR, which is an Oculus SDK component.
+    set(DIR "openvr")
+    add_subdirectory(${DIR})
+  endif()
 
   set(DIR "hifiSdl2")
   add_subdirectory(${DIR})