Merge branch 'darby_main_original' into test_merge

ggarra13 · Feb 20, 2024 · 840cc7b · 840cc7b
2 parents b815e4d + 3083cae
commit 840cc7b
Show file tree

Hide file tree

Showing 41 changed files with 1,015 additions and 289 deletions.
diff --git a/etc/Linux/linux-build-gha.sh b/etc/Linux/linux-build-gha.sh
@@ -58,6 +58,7 @@ cmake ../etc/SuperBuild \
     -DCMAKE_CXX_STANDARD=$CMAKE_CXX_STANDARD \
     -DTLRENDER_PYTHON=$TLRENDER_PYTHON \
     -DTLRENDER_GLFW=$TLRENDER_GLFW \
+    -DTLRENDER_NET=$TLRENDER_NET \
     -DTLRENDER_OCIO=$TLRENDER_OCIO \
     -DTLRENDER_AUDIO=$TLRENDER_AUDIO \
     -DTLRENDER_JPEG=$TLRENDER_JPEG \

diff --git a/etc/SuperBuild/CMakeLists.txt b/etc/SuperBuild/CMakeLists.txt
@@ -11,6 +11,7 @@ project(tlRender-SuperBuild)
 set(TLRENDER_PYTHON FALSE CACHE BOOL "Enable Python support (for OTIO Python adapters)")
 set(TLRENDER_API "GL_4_1" CACHE STRING "Graphics API (GL_4_1, GL_4_1_Debug, GLES_2)")
 set(TLRENDER_GLFW TRUE CACHE BOOL "Enable support for GLFW")
+set(TLRENDER_GLFW_DISABLE_MACOS_APP_DELEGATE FALSE CACHE BOOL "Disable the GLFW application delegate on macOS")
 set(TLRENDER_NET FALSE CACHE BOOL "Enable network support")
 set(TLRENDER_OCIO TRUE CACHE BOOL "Enable support for OpenColorIO")
 set(TLRENDER_AUDIO TRUE CACHE BOOL "Enable support for audio")

diff --git a/etc/SuperBuild/cmake/Modules/Buildglfw3.cmake b/etc/SuperBuild/cmake/Modules/Buildglfw3.cmake
@@ -17,6 +17,14 @@ if(UNIX AND NOT APPLE)
     endif()
 endif()
 
+set(glfw3_PATCH)
+if(TLRENDER_GLFW_DISABLE_MACOS_APP_DELEGATE)
+    set(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)
+endif()
+
 set(glfw3_ARGS
     ${TLRENDER_EXTERNAL_ARGS}
     ${glfw3_Linux_ARGS}
@@ -30,6 +38,7 @@ ExternalProject_Add(
     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/glfw3
     GIT_REPOSITORY ${glfw3_GIT_REPOSITORY}
     GIT_TAG ${glfw3_GIT_TAG}
+    PATCH_COMMAND ${glfw3_PATCH}
     LIST_SEPARATOR |
     CMAKE_ARGS ${glfw3_ARGS})