Merge branch 'beta' of github.com:ggarra13/mrv2 into beta

ggarra13 · Apr 12, 2024 · 3785e21 · 3785e21
2 parents 1eafb9a + 4aa80cf
commit 3785e21
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/bin/runme_minimal.sh b/bin/runme_minimal.sh
@@ -27,7 +27,7 @@ params=$*
 #
 . etc/build_dir.sh
 
-export BUILD_DIR=$BUILD_DIR-minimal
+export BUILD_DIR=BUILD-$KERNEL-$ARCH-minimal/${CMAKE_BUILD_TYPE}
 mkdir -p $BUILD_DIR
 
 
@@ -44,7 +44,7 @@ echo "Saving compile log to $BUILD_DIR/compile.log ..."
 #
 # These are some of the expensive mrv2 options
 #
-export BUILD_PYTHON=ON
+export BUILD_PYTHON=OFF
 export MRV2_PYFLTK=OFF
 export MRV2_PYBIND11=OFF
 export MRV2_NETWORK=OFF

diff --git a/cmake/Modules/BuildFLTK.cmake b/cmake/Modules/BuildFLTK.cmake
@@ -68,6 +68,7 @@ ExternalProject_Add(
     -DFLTK_BUILD_HTML_DOCS=OFF
     -DFLTK_BUILD_TEST=OFF
     -DFLTK_BUILD_SHARED_LIBS=${FLTK_BUILD_SHARED_LIBS}
+    -DFLTK_USE_SYSTEM_LIBDECOR=1
     -DFLTK_USE_SYSTEM_ZLIB=1
     -DFLTK_USE_SYSTEM_LIBJPEG=1
     -DFLTK_USE_SYSTEM_LIBPNG=1

diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md
@@ -23,6 +23,9 @@ v1.1.2
   change in tlRender broke it.
 - Updated mrv2 to Python 3.11 to conform to the VFX 2024 Platform.
 - Python 3.11 on Windows is now built with optimizations on.
+- Updated mrv2's glfw3 to 3.4.
+- Updated mrv2's FLTK build to use the system libdecor
+  (needs v0.2.2 at least).
 
 
 v1.1.1

diff --git a/tlRender b/tlRender