Merge branch 'errissa/glfw-upgrade' into errissa/filament-1.46

.github/workflows/macos.yml

@@ -32,9 +32,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # macos-12 is Intel runner, macos-14 is Apple Silicon
+        # macos-13 is Intel runner, macos-14 is Apple Silicon
         # https://github.com/actions/runner-images
-        os: [macos-12, macos-14]
+        os: [macos-13, macos-14]
         CONFIG: [ON, OFF]
     env:
       BUILD_SHARED_LIBS: ${{ matrix.CONFIG }}
@@ -68,23 +68,16 @@ jobs:
         run: |
           brew install ccache pkg-config
 
-          if [[ ${{ runner.arch}} == "ARM64"  ]]; then
+          if [[ ${{ runner.arch }} == "ARM64"  ]]; then
             # Fix gfortran not found issue
             ln -s $(which gfortran-13) /usr/local/bin/gfortran
-
-            # Default macos-14 image Xcode (version 15.0.1) linker causes build issues.
-            # Newer Xcode versions work, but embree recommends Apple clang <= 14 on
-            # arm64 to avoid possible "EXEC_BAD_INSTRUCTION" runtime exceptions:
-            # https://github.com/embree/embree/releases/tag/v4.3.1
-            sudo xcode-select -switch /Applications/Xcode_14.3.1.app
           fi
 
           # Install libomp 11.1.0 from old brew bottle for x64 catalina (10.15)
           # / arm64 big sur (11.0). Directly installing the Ruby formula will
           # install for the current OS.
           # https://github.com/microsoft/LightGBM/issues/4229
           if [[ ${{ runner.arch}} == "X64"  ]]; then
-            brew unlink libomp
             # x64 catalina (10.15) bottle
             export LIBOMP_BOTTLE_HASH=45a5aa653bd45bd5ff5858580b1a4670c4b5a51ea29d68d45a53f72f56010e05
           else # ARM64
@@ -142,7 +135,7 @@ jobs:
     permissions:
       contents: write  # Release upload
     name: Fuse x64 and ARM64 viewer app
-    runs-on: [macos-12]
+    runs-on: [macos-13]
     needs: [MacOS]
     steps:
       - name: Checkout source code  # for gh release upload
@@ -191,9 +184,9 @@ jobs:
       fail-fast: false
       # https://github.community/t/how-to-conditionally-include-exclude-items-in-matrix-eg-based-on-branch/16853/6
       matrix:
-        # macos-12 is Intel runner, macos-14 is Apple Silicon
+        # macos-13 is Intel runner, macos-14 is Apple Silicon
         # https://github.com/actions/runner-images
-        os: [macos-12, macos-14]
+        os: [macos-13, macos-14]
         python_version: ['3.8', '3.9', '3.10', '3.11', '3.12']
         is_main:
           - ${{ github.ref == 'refs/heads/main' }}
@@ -260,12 +253,10 @@ jobs:
           # Fix macos-14 arm64 runner image issues, see comments in MacOS job.
           if [[ ${{ runner.arch}} == "ARM64"  ]]; then
             ln -s $(which gfortran-13) /usr/local/bin/gfortran
-            sudo xcode-select -switch /Applications/Xcode_14.3.1.app
           fi
 
           # Install libomp 11.1.0. See comment above.
           if [[ ${{ runner.arch}} == "X64"  ]]; then
-            brew unlink libomp
             # x64 catalina (10.15) bottle
             export LIBOMP_BOTTLE_HASH=45a5aa653bd45bd5ff5858580b1a4670c4b5a51ea29d68d45a53f72f56010e05
           else # ARM64
@@ -308,7 +299,7 @@ jobs:
     name: Fuse universal2 wheel
     permissions:
       contents: write  # Release upload
-    runs-on: [macos-12]
+    runs-on: [macos-13]
     needs: [build-wheel]
     strategy:
       fail-fast: false
@@ -379,7 +370,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-12, macos-14]
+        os: [macos-13, macos-14]
         python_version: ['3.8', '3.9', '3.10', '3.11', '3.12']
         is_main:
           - ${{ github.ref == 'refs/heads/main' }}

.github/workflows/ubuntu-cuda.yml

@@ -180,7 +180,7 @@ jobs:
           gcloud compute ssh "${INSTANCE_NAME}" \
             --zone="${GCE_ZONE}" \
             --command="ls -alh \
-                    && gsutil cp ${CCACHE_TAR_NAME}.tar.gz gs://open3d-ci-cache/"
+                    && gsutil cp ${CCACHE_TAR_NAME}.tar.xz gs://open3d-ci-cache/"
 
       - name: VM delete
         if: always()

3rdparty/find_dependencies.cmake

@@ -682,14 +682,15 @@ if(USE_SYSTEM_GLFW)
     endif()
 endif()
 if(NOT USE_SYSTEM_GLFW)
-    message(STATUS "Building library 3rdparty_glfw from source")
-    add_subdirectory(${Open3D_3RDPARTY_DIR}/glfw)
+    include(${Open3D_3RDPARTY_DIR}/glfw/glfw.cmake)
     open3d_import_3rdparty_library(3rdparty_glfw
         HEADER
-        INCLUDE_DIRS ${Open3D_3RDPARTY_DIR}/glfw/include/
-        LIBRARIES    glfw3
-        DEPENDS      glfw
+        INCLUDE_DIRS ${GLFW_INCLUDE_DIRS}
+        LIB_DIR      ${GLFW_LIB_DIR}
+        LIBRARIES    ${GLFW_LIBRARIES}
+        DEPENDS      ext_glfw
     )
+
     target_link_libraries(3rdparty_glfw INTERFACE Open3D::3rdparty_threads)
     if(UNIX AND NOT APPLE)
         find_library(RT_LIBRARY rt)
@@ -720,8 +721,9 @@ if(NOT USE_SYSTEM_GLFW)
         target_link_libraries(3rdparty_glfw INTERFACE gdi32)
     endif()
     list(APPEND Open3D_3RDPARTY_HEADER_TARGETS_FROM_CUSTOM Open3D::3rdparty_glfw)
+    list(APPEND Open3D_3RDPARTY_PRIVATE_TARGETS_FROM_CUSTOM Open3D::3rdparty_glfw)
 else()
-    list(APPEND Open3D_3RDPARTY_HEADER_TARGETS_FROM_SYSTEM Open3D::3rdparty_glfw)
+    list(APPEND Open3D_3RDPARTY_PRIVATE_TARGETS_FROM_SYSTEM Open3D::3rdparty_glfw)
 endif()
 if(TARGET Open3D::3rdparty_x11)
     target_link_libraries(3rdparty_glfw INTERFACE Open3D::3rdparty_x11)