Update to latest GLFW 3.4 (#6587)

* Remove GLFW source --------- Co-authored-by: Sameer Sheorey <[email protected]>
isl-org · Jan 3, 2025 · 9149c9c · 9149c9c
1 parent c0be4a6
commit 9149c9c
Show file tree

Hide file tree

Showing 108 changed files with 54 additions and 77,790 deletions.
diff --git a/3rdparty/find_dependencies.cmake b/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)

diff --git a/3rdparty/glfw/.gitignore b/3rdparty/glfw/.gitignore
diff --git a/3rdparty/glfw/CMake/GenerateMappings.cmake b/3rdparty/glfw/CMake/GenerateMappings.cmake
diff --git a/3rdparty/glfw/CMake/MacOSXBundleInfo.plist.in b/3rdparty/glfw/CMake/MacOSXBundleInfo.plist.in
diff --git a/3rdparty/glfw/CMake/amd64-mingw32msvc.cmake b/3rdparty/glfw/CMake/amd64-mingw32msvc.cmake
diff --git a/3rdparty/glfw/CMake/i586-mingw32msvc.cmake b/3rdparty/glfw/CMake/i586-mingw32msvc.cmake
diff --git a/3rdparty/glfw/CMake/i686-pc-mingw32.cmake b/3rdparty/glfw/CMake/i686-pc-mingw32.cmake
diff --git a/3rdparty/glfw/CMake/i686-w64-mingw32.cmake b/3rdparty/glfw/CMake/i686-w64-mingw32.cmake
diff --git a/3rdparty/glfw/CMake/modules/FindMir.cmake b/3rdparty/glfw/CMake/modules/FindMir.cmake
diff --git a/3rdparty/glfw/CMake/modules/FindOSMesa.cmake b/3rdparty/glfw/CMake/modules/FindOSMesa.cmake
diff --git a/3rdparty/glfw/CMake/modules/FindVulkan.cmake b/3rdparty/glfw/CMake/modules/FindVulkan.cmake
diff --git a/3rdparty/glfw/CMake/modules/FindWaylandProtocols.cmake b/3rdparty/glfw/CMake/modules/FindWaylandProtocols.cmake
diff --git a/3rdparty/glfw/CMake/modules/FindXKBCommon.cmake b/3rdparty/glfw/CMake/modules/FindXKBCommon.cmake