Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to latest GLFW #6587

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions 3rdparty/find_dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -671,14 +671,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)
Expand Down Expand Up @@ -709,8 +710,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)
Expand Down
75 changes: 0 additions & 75 deletions 3rdparty/glfw/.gitignore

This file was deleted.

33 changes: 0 additions & 33 deletions 3rdparty/glfw/CMake/GenerateMappings.cmake

This file was deleted.

38 changes: 0 additions & 38 deletions 3rdparty/glfw/CMake/MacOSXBundleInfo.plist.in

This file was deleted.

13 changes: 0 additions & 13 deletions 3rdparty/glfw/CMake/amd64-mingw32msvc.cmake

This file was deleted.

13 changes: 0 additions & 13 deletions 3rdparty/glfw/CMake/i586-mingw32msvc.cmake

This file was deleted.

13 changes: 0 additions & 13 deletions 3rdparty/glfw/CMake/i686-pc-mingw32.cmake

This file was deleted.

13 changes: 0 additions & 13 deletions 3rdparty/glfw/CMake/i686-w64-mingw32.cmake

This file was deleted.

34 changes: 0 additions & 34 deletions 3rdparty/glfw/CMake/modules/FindMir.cmake

This file was deleted.

18 changes: 0 additions & 18 deletions 3rdparty/glfw/CMake/modules/FindOSMesa.cmake

This file was deleted.

46 changes: 0 additions & 46 deletions 3rdparty/glfw/CMake/modules/FindVulkan.cmake

This file was deleted.

26 changes: 0 additions & 26 deletions 3rdparty/glfw/CMake/modules/FindWaylandProtocols.cmake

This file was deleted.

34 changes: 0 additions & 34 deletions 3rdparty/glfw/CMake/modules/FindXKBCommon.cmake

This file was deleted.

Loading
Loading