Skip to content

Commit e86e7a9

Browse files
authored
Merge branch 'main' into vfx_2026_fix5
2 parents 30a3ebf + 1c60993 commit e86e7a9

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

packages/conan/recipes/ocio/patches/2.3.2-0001-fix-cmake-source-dir-and-targets.patch

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
diff --git CMakeLists.txt CMakeLists.txt
2-
index 7b62a993..5ea33694 100755
3-
--- CMakeLists.txt
4-
+++ CMakeLists.txt
5-
@@ -511,7 +511,7 @@ install(
6-
FILE ${OCIO_TARGETS_EXPORT_NAME}
7-
)
8-
9-
-if (NOT BUILD_SHARED_LIBS)
10-
+if (0)
11-
# Install custom macros used in the find modules.
12-
install(FILES
13-
${CMAKE_CURRENT_LIST_DIR}/share/cmake/macros/VersionUtils.cmake
141
diff --git share/cmake/modules/FindExtPackages.cmake share/cmake/modules/FindExtPackages.cmake
152
index 2625242c..dcb41cf2 100644
163
--- share/cmake/modules/FindExtPackages.cmake

0 commit comments

Comments
 (0)