From 025e7c07794913a8cf8191247777393300797a0b Mon Sep 17 00:00:00 2001 From: SlawekNowy <38943477+SlawekNowy@users.noreply.github.com> Date: Fri, 12 Apr 2024 12:17:36 +0200 Subject: [PATCH 1/3] Update FindExtPackages.cmake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sławomir Śpiewak --- share/cmake/modules/FindExtPackages.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake index 9b06319221..d7dfdc631a 100644 --- a/share/cmake/modules/FindExtPackages.cmake +++ b/share/cmake/modules/FindExtPackages.cmake @@ -114,6 +114,10 @@ ocio_handle_dependency( minizip-ng REQUIRED ALLOW_INSTALL MIN_VERSION 3.0.6 RECOMMENDED_VERSION 3.0.7 RECOMMENDED_VERSION_REASON "Latest version tested with OCIO") +#minizip-ng requires zlib headers, so we force the dep. +if(TARGET ZLIB::ZLIB AND TARGET MINIZIP::minizip-ng) +add_dependencies(MINIZIP::minizip-ng ZLIB::ZLIB) +endif() ############################################################################### ## From e574eebcac73b70a6bbc2bb83e64bf487f51f98c Mon Sep 17 00:00:00 2001 From: MrSoup678 Date: Tue, 4 Jun 2024 14:53:06 +0200 Subject: [PATCH 2/3] Update Installminizip-ng.cmake Fix an occasional race condition caused by zlib building before minizip-ng. --- share/cmake/modules/install/Installminizip-ng.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/share/cmake/modules/install/Installminizip-ng.cmake b/share/cmake/modules/install/Installminizip-ng.cmake index eba4816918..19c54a950a 100644 --- a/share/cmake/modules/install/Installminizip-ng.cmake +++ b/share/cmake/modules/install/Installminizip-ng.cmake @@ -131,6 +131,7 @@ if(NOT minizip-ng_FOUND AND OCIO_INSTALL_EXT_PACKAGES AND NOT OCIO_INSTALL_EXT_P --config ${CMAKE_BUILD_TYPE} --target install --parallel + DEPENDS ZLIB::ZLIB # minizip-ng depends on zlib ) add_dependencies(MINIZIP::minizip-ng minizip-ng_install) From 6fb350b1a2027bffaf5b3a04517efea6b33788a7 Mon Sep 17 00:00:00 2001 From: MrSoup678 Date: Wed, 5 Jun 2024 19:02:39 +0200 Subject: [PATCH 3/3] Revert "Update FindExtPackages.cmake" This reverts commit 025e7c07794913a8cf8191247777393300797a0b. Signed-off-by: MrSoup678 --- share/cmake/modules/FindExtPackages.cmake | 4 ---- 1 file changed, 4 deletions(-) diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake index d7dfdc631a..9b06319221 100644 --- a/share/cmake/modules/FindExtPackages.cmake +++ b/share/cmake/modules/FindExtPackages.cmake @@ -114,10 +114,6 @@ ocio_handle_dependency( minizip-ng REQUIRED ALLOW_INSTALL MIN_VERSION 3.0.6 RECOMMENDED_VERSION 3.0.7 RECOMMENDED_VERSION_REASON "Latest version tested with OCIO") -#minizip-ng requires zlib headers, so we force the dep. -if(TARGET ZLIB::ZLIB AND TARGET MINIZIP::minizip-ng) -add_dependencies(MINIZIP::minizip-ng ZLIB::ZLIB) -endif() ############################################################################### ##