From cefe3a27417ff009811098902fc98df063873ca3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Tue, 9 Apr 2024 23:27:55 -0300 Subject: [PATCH] Updated to latest tlRender. Listing of library locations in FLTK (temporary). --- .github/workflows/full_macos14.yml | 2 +- cmake/Modules/BuildFLTK.cmake | 2 +- tlRender | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/full_macos14.yml b/.github/workflows/full_macos14.yml index 4d27654e6..4ce55280e 100644 --- a/.github/workflows/full_macos14.yml +++ b/.github/workflows/full_macos14.yml @@ -23,7 +23,7 @@ jobs: - name: Get machine name run: | echo "Machine name: $RUNNER_NAME" - + - name: Install ninja-build run: brew install ninja diff --git a/cmake/Modules/BuildFLTK.cmake b/cmake/Modules/BuildFLTK.cmake index 54a79beed..9efef9309 100644 --- a/cmake/Modules/BuildFLTK.cmake +++ b/cmake/Modules/BuildFLTK.cmake @@ -6,7 +6,7 @@ include( ExternalProject ) #set( FLTK_GIT_TAG master ) #set(FLTK_GIT_TAG 26f5b38a0113be817d13193387913580b5996d77) # Previous stable TAG -set(FLTK_GIT_TAG 31170c47314a8b71331dd7d63c898478edc98c84) +set(FLTK_GIT_TAG 265e5cd77b30581e7701927930d8fa887e0361df) # has paths to libs set( FLTK_BUILD_SHARED_LIBS ON ) # We no longer compile static. diff --git a/tlRender b/tlRender index cc8803efd..394b8eeb8 160000 --- a/tlRender +++ b/tlRender @@ -1 +1 @@ -Subproject commit cc8803efd708ad12e9ca8f29cfd37c273e207c45 +Subproject commit 394b8eeb81dc208b769933c9c3ef176504e1e709