opencolorio: add version 2.3.0, update dependencies #19549
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -12,15 +12,24 @@ index 17e188d..91af0ec 100755 | |||||
| install(FILES | ||||||
| ${CMAKE_CURRENT_LIST_DIR}/share/cmake/macros/VersionUtils.cmake | ||||||
| diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake | ||||||
| index 5455a08..420fbd4 100644 | ||||||
| --- a/share/cmake/modules/FindExtPackages.cmake | ||||||
| +++ b/share/cmake/modules/FindExtPackages.cmake | ||||||
| @@ -41,7 +41,7 @@ find_package(expat 2.4.1 REQUIRED) | ||||||
|
|
||||||
| # yaml-cpp | ||||||
| # https://github.com/jbeder/yaml-cpp | ||||||
| -find_package(yaml-cpp 0.7.0 REQUIRED) | ||||||
| +find_package(yaml-cpp 0.8.0 REQUIRED) | ||||||
|
|
||||||
| # pystring | ||||||
| # https://github.com/imageworks/pystring | ||||||
| @@ -138,7 +138,7 @@ endif() | ||||||
|
|
||||||
| # minizip-ng | ||||||
| # https://github.com/zlib-ng/minizip-ng | ||||||
| -find_package(minizip-ng 3.0.7 REQUIRED) | ||||||
| +find_package(minizip 3.0.9 REQUIRED) | ||||||
|
There was a problem hiding this comment.
Suggested change
As above. There was a problem hiding this comment. @irieger |
||||||
|
|
||||||
| if(OCIO_BUILD_APPS) | ||||||
|
|
||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index a36a0d8..650a3c5 100755 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -508,7 +508,7 @@ install( | ||
| FILE ${OCIO_TARGETS_EXPORT_NAME} | ||
| ) | ||
|
|
||
| -if (NOT BUILD_SHARED_LIBS) | ||
| +if (0) | ||
| # Install custom macros used in the find modules. | ||
| install(FILES | ||
| ${CMAKE_CURRENT_LIST_DIR}/share/cmake/macros/VersionUtils.cmake | ||
| diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake | ||
| index 2625242..dcb41cf 100644 | ||
| --- a/share/cmake/modules/FindExtPackages.cmake | ||
| +++ b/share/cmake/modules/FindExtPackages.cmake | ||
| @@ -63,7 +63,7 @@ ocio_handle_dependency( expat REQUIRED ALLOW_INSTALL | ||
| # https://github.com/jbeder/yaml-cpp | ||
| ocio_handle_dependency( yaml-cpp REQUIRED ALLOW_INSTALL | ||
| MIN_VERSION 0.6.3 | ||
| - RECOMMENDED_VERSION 0.7.0 | ||
| + RECOMMENDED_VERSION 0.8.0 | ||
| RECOMMENDED_VERSION_REASON "Latest version tested with OCIO") | ||
|
|
||
| # pystring | ||
| @@ -110,9 +110,9 @@ ocio_handle_dependency( ZLIB REQUIRED ALLOW_INSTALL | ||
|
|
||
| # minizip-ng | ||
| # https://github.com/zlib-ng/minizip-ng | ||
| -ocio_handle_dependency( minizip-ng REQUIRED ALLOW_INSTALL | ||
| +ocio_handle_dependency( minizip REQUIRED ALLOW_INSTALL | ||
| MIN_VERSION 3.0.6 | ||
| - RECOMMENDED_VERSION 3.0.7 | ||
| + RECOMMENDED_VERSION 4.0.1 | ||
| RECOMMENDED_VERSION_REASON "Latest version tested with OCIO") | ||
|
|
||
| ############################################################################### | ||
| @@ -131,7 +131,7 @@ if(OCIO_BUILD_APPS) | ||
|
|
||
| # lcms2 | ||
| # https://github.com/mm2/Little-CMS | ||
| - ocio_handle_dependency( lcms2 REQUIRED ALLOW_INSTALL | ||
| + ocio_handle_dependency( lcms REQUIRED ALLOW_INSTALL | ||
| MIN_VERSION 2.2 | ||
| RECOMMENDED_VERSION 2.2 | ||
| RECOMMENDED_VERSION_REASON "Latest version tested with OCIO") | ||
| diff --git a/share/cmake/utils/CppVersion.cmake b/share/cmake/utils/CppVersion.cmake | ||
| index 175d89c..2d34a65 100644 | ||
| --- a/share/cmake/utils/CppVersion.cmake | ||
| +++ b/share/cmake/utils/CppVersion.cmake | ||
| @@ -16,8 +16,6 @@ elseif(NOT CMAKE_CXX_STANDARD IN_LIST SUPPORTED_CXX_STANDARDS) | ||
| "CMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} is unsupported. Supported standards are: ${SUPPORTED_CXX_STANDARDS_STR}.") | ||
| endif() | ||
|
|
||
| -set_property(CACHE CMAKE_CXX_STANDARD PROPERTY STRINGS "${SUPPORTED_CXX_STANDARDS}") | ||
| - | ||
| include(CheckCXXCompilerFlag) | ||
|
|
||
| # As CheckCXXCompilerFlag implicitly uses CMAKE_CXX_FLAGS some custom flags could trigger unrelated | ||
| diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt | ||
| index 7ff40bf..dec2bda 100755 | ||
| --- a/src/OpenColorIO/CMakeLists.txt | ||
| +++ b/src/OpenColorIO/CMakeLists.txt | ||
| @@ -309,8 +309,8 @@ target_link_libraries(OpenColorIO | ||
| "$<BUILD_INTERFACE:utils::from_chars>" | ||
| "$<BUILD_INTERFACE:utils::strings>" | ||
| "$<BUILD_INTERFACE:xxHash>" | ||
| - ${YAML_CPP_LIBRARIES} | ||
| - MINIZIP::minizip-ng | ||
| + yaml-cpp | ||
| + MINIZIP::minizip | ||
| ) | ||
|
|
||
| if(OCIO_USE_SIMD AND OCIO_USE_SSE2NEON AND COMPILER_SUPPORTS_SSE_WITH_SSE2NEON) | ||
| diff --git a/src/apps/ocioarchive/CMakeLists.txt b/src/apps/ocioarchive/CMakeLists.txt | ||
| index 599d706..efe6cd5 100644 | ||
| --- a/src/apps/ocioarchive/CMakeLists.txt | ||
| +++ b/src/apps/ocioarchive/CMakeLists.txt | ||
| @@ -21,7 +21,7 @@ target_link_libraries(ocioarchive | ||
| PRIVATE | ||
| apputils | ||
| OpenColorIO | ||
| - MINIZIP::minizip-ng | ||
| + MINIZIP::minizip | ||
| ) | ||
|
|
||
| include(StripUtils) | ||
| diff --git a/src/apps/ociobakelut/CMakeLists.txt b/src/apps/ociobakelut/CMakeLists.txt | ||
| index 3d6e586..f7069a1 100755 | ||
| --- a/src/apps/ociobakelut/CMakeLists.txt | ||
| +++ b/src/apps/ociobakelut/CMakeLists.txt | ||
| @@ -29,7 +29,7 @@ set_target_properties(ociobakelut | ||
| target_link_libraries(ociobakelut | ||
| PRIVATE | ||
| apputils | ||
| - lcms2::lcms2 | ||
| + lcms::lcms | ||
| OpenColorIO | ||
| ) | ||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have never used the version parameter in cmake myself, but does it make sense to fix the version here? Maybe someone has a reason to overwrite the version of yaml-cpp etc. and as long as there is no hard reason I'd personally not restrict it to a fixed version maybe.