Merge branch 'main' of https://github.com/darbyjohnston/tlRender

darbyjohnston · Jun 1, 2024 · 9eac933 · 9eac933
2 parents e25d115 + c425a90
commit 9eac933
Show file tree

Hide file tree

Showing 5 changed files with 409 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,3 +6,5 @@ doc/doxygen
 *~
 .git
 .vscode
+.DS_Store
+.cache
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -215,7 +215,7 @@ if(TLRENDER_QT6 AND NOT "${TLRENDER_API}" STREQUAL "GLES_2")
     set(CMAKE_AUTOMOC ON)
     set(CMAKE_AUTORCC ON)
     set(CMAKE_AUTOUIC ON)
-    find_package(Qt6 COMPONENTS Quick Widgets OpenGLWidgets Svg HINTS "$ENV{QTDIR}")
+    find_package(Qt6 REQUIRED COMPONENTS Quick Widgets OpenGLWidgets Svg HINTS "$ENV{QTDIR}")
 elseif(TLRENDER_QT5 AND NOT "${TLRENDER_API}" STREQUAL "GLES_2")
     set(CMAKE_AUTOMOC ON)
     set(CMAKE_AUTORCC ON)

diff --git a/etc/SuperBuild/cmake/Modules/Buildglfw3.cmake b/etc/SuperBuild/cmake/Modules/Buildglfw3.cmake
@@ -3,9 +3,12 @@ include(ExternalProject)
 set(glfw3_GIT_REPOSITORY "https://github.com/glfw/glfw.git")
 set(glfw3_GIT_TAG "3eaf1255b29fdf5c2895856c7be7d7185ef2b241")
 
-set(glfw3_PATCH)
+set(glfw3_PATCH
+    ${CMAKE_COMMAND} -E copy_if_different
+    ${CMAKE_CURRENT_SOURCE_DIR}/glfw3-patch/src/nsgl_context.m
+    ${CMAKE_CURRENT_BINARY_DIR}/glfw3/src/glfw3/src/nsgl_context.m)
 if(TLRENDER_GLFW_DISABLE_MACOS_APP_DELEGATE)
-    set(glfw3_PATCH
+    list(APPEND glfw3_PATCH
         ${CMAKE_COMMAND} -E copy_if_different
         ${CMAKE_CURRENT_SOURCE_DIR}/glfw3-patch/src/cocoa_init.m
         ${CMAKE_CURRENT_BINARY_DIR}/glfw3/src/glfw3/src/cocoa_init.m)