* Merging the previous ARM Neon branch
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Testing each SIMD variants using a small code snippet and first pass on unifying the way related cmake variables
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Removing the usage of USE_SSE in favor of the new OCIO_USE_SSE2 as they serve the same purpose
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Using try_compile instead of check_cxx_source_compiles as it was given false positive. Stubbing cpuinfo for Apple ARM plateform. Handling Apple M1 correctly and adding support for SSE2NEON.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Comments clean up and refactor some comments and documentations
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Added something in the documentation for Rosetta and small change in cmake
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fixing the build under Rosetta and fixing issue in the MacOS CI.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Using try_compile for CheckSupportSSEUsingSSE2NEON to standardize the code and fixed CheckSupport compiler flags.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* use emmintrin.h for only sse2 features
Signed-off-by: Mark Reid <mindmark@gmail.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Allow F16C to be completely turned off
Signed-off-by: Mark Reid <mindmark@gmail.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Seperate SIMD test code from code that adds unit tests.
This isolates the compulation units and
avoids executing illegal hardware instructions
Signed-off-by: Mark Reid <mindmark@gmail.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* remove uneeded checks
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* use software implementations of f16c intrinsics for SSE2
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Added preprocessor checks for ARM as it is needed for universal build on APPLE platform
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Adding missing checks for "not arm64"
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Ease the future maintainability a the new OCIO_USE_xyz be moving the logic into CPUInfoConfig.h.in as well as fixing issue on ARM when building with OCIO_USE_SSE2NEON=OFF.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fixing some spacing, documentations and making some cmake conditions clearer.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Adding a build in ci_workflow for macos USE_OCIO_SSE2NEON=OFF
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* typo
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Changing back all the macOS (except one) builds to x86_64 only as it takes double the time to do the universal build.
OCIO no longuer build a universal binary by default
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Update the CMakeLists.txt logic to accomodate all scenario and fixing documentations.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Update documentation and remove ocio_use_sse2neon from the CI matrix
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
---------
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Mark Reid <mindmark@gmail.com>
Signed-off-by: Cédrik Fuoco <105517825+cedrik-fuoco-adsk@users.noreply.github.com>
Co-authored-by: Mark Reid <mindmark@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
* Initial commit of ocioview
Signed-off-by: Michael Dolan <michdolan@gmail.com>
* Improve config version selection and reloading
Signed-off-by: Michael Dolan <michdolan@gmail.com>
* Bug fixes and improved warnings
Signed-off-by: Michael Dolan <michdolan@gmail.com>
* Improve async log and code routing
Signed-off-by: Michael Dolan <michdolan@gmail.com>
* Add settings, improve transform interface
Signed-off-by: Michael Dolan <michdolan@gmail.com>
* Fix viewer and code view update bugs
Signed-off-by: Michael Dolan <michdolan@gmail.com>
* Add README and inspector panel with curve viewer
Signed-off-by: Michael Dolan <michdolan@gmail.com>
* Curve viewer log fix
Signed-off-by: Michael Dolan <michdolan@gmail.com>
* Add curve view labels
Signed-off-by: Michael Dolan <michdolan@gmail.com>
* Update README, improve curve grid rendering
Signed-off-by: Michael Dolan <michdolan@gmail.com>
---------
Signed-off-by: Michael Dolan <michdolan@gmail.com>
Co-authored-by: Rémi Achard <remiachard@gmail.com>
* Use `TARGET` for the config if-statements.
The check would always evaluate to true otherwise.
Signed-off-by: Pierre Wendling <pierre.wendling.4@gmail.com>
* Use PACKAGE_PREFIX_DIR from PACKAGE_INIT.
This avoids guessing the path to the prefix.
Signed-off-by: Pierre Wendling <pierre.wendling.4@gmail.com>
* Add compatibility with yaml-cpp 0.8.0 target.
The target was renamed to `yaml-cpp::yaml-cpp`, which breaks when using
the upstream CMake package over the Find module.
Signed-off-by: Pierre Wendling <pierre.wendling.4@gmail.com>
---------
Signed-off-by: Pierre Wendling <pierre.wendling.4@gmail.com>
Co-authored-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
* Added GetProcessorFromConfigs variants for displays and views.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
* Added display-view processor from two configs tests, moved direction argument last.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
---------
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
Co-authored-by: Michael Dolan <michdolan@gmail.com>
* Fixing a warning in one of the python unit test
Removing expected info log in some python unit test
Removing expected info log about inactive colorspace in Cpp unit test
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Using sudio config instead of cg config where it makes sense
renaming unit test inactive_colospace to is_inactive
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
---------
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
* Exposed option to allow/disallow 1D texture GPU resources for 1D LUTs.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
* New API to get or add 1D LUT textures with the specified dimensions.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
* Fix errors relevealed by CIS related to texture dimension API change.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
* Update gpu shader tests away from now deprecated get/add texture functions.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
* Converted deprecated get/add texture functions from pure virtual to virtual.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
* Commenting out unused parameters on deprecated functions to mitigate warnings.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
* Addressing review notes.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
* Updated python addTexture/getTextures test with latest interface.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
* Further update python and metal samples to new texture dimensions API.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
* Improvements: moved default deprecated implementations to base classes, avoided asserts, fixed typo and naming.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
* Follow spacing/formatting convention arguments.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
* Removed the original addTexture and getTexture methods.
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
---------
Signed-off-by: Eric Renaud-Houde <eric.renaud.houde@gmail.com>
Co-authored-by: Rémi Achard <remiachard@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
* Added ResolveConfigPath function
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Added support for ocio://cg-config-latest and ocio://studio-config-latest
Added unit tests that covers the new names.
CreateFromBuiltinConfig now supports the URI interface directly as well. Previously, it was supporting only the built-in config name (not a URI). The config name was parsed out of the URI before passing it to CreateFromBuiltConfig by CreateFromFile.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Documentations and typos
Tweaking unit tests
Other minor changes
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* documentations
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Using OCIO_BUILTIN_URI_PREFIX where we can in the code (not in tests)
Adding missing type in PyTypes.cpp
Change name of constexpr to follow the others in OCIO (all in capital)
Moved them to the cpp file since they can be useful in tests
Comments
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* documentation
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fixing error : ISO C++ forbids converting a string constant to 'char*' that was brought up with Clang under Linux and macos.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Remove deprecation for getDefaultBuiltinConfigName. Will wait for 2.3 release.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fixing issue with the rebase
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
---------
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Cédrik Fuoco <105517825+cedrik-fuoco-adsk@users.noreply.github.com>
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
* Add AVX2/AVX/SSE2 accelerated pack/unpacking function templates
Signed-off-by: Mark Reid <mindmark@gmail.com>
* Add AVX2/AVX/SSE2 accelerated Lut3D Tetrahedral implementations
Signed-off-by: Mark Reid <mindmark@gmail.com>
* Add AVX2/AVX/SSE2 accelerated linear Lut1D implementations
Signed-off-by: Mark Reid <mindmark@gmail.com>
* Fix a bunch of typos
Signed-off-by: Mark Reid <mindmark@gmail.com>
* Remove USE_SSE code that is no longer needed
Signed-off-by: Mark Reid <mindmark@gmail.com>
* Use alignas specifier
Signed-off-by: Mark Reid <mindmark@gmail.com>
* Move x86 simd checking code to seperate file
Signed-off-by: Mark Reid <mindmark@gmail.com>
* Fix cacheID test, compare lengths and everything but the cacheID hash
Signed-off-by: Mark Reid <mindmark@gmail.com>
* Remove debug gather code
Signed-off-by: Mark Reid <mindmark@gmail.com>
* fixed outBD typo
Signed-off-by: Mark Reid <mindmark@gmail.com>
---------
Signed-off-by: Mark Reid <mindmark@gmail.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
* - Implementation of identifyInterchangeSpace, identifyBuiltinColorSpace and AreProcessorsEquivalent.
- Remove some include of Processor.h where it wasn't needed.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Moving code from Config.cpp to ConfigUtils.cpp and using wrapper in Config.cpp instead.
Fixing identations issues.
Fixing styling issues.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Typo and comments tweaks
Moving the creation of the editable config into the wrapper of isColorSpaceLinear instead of doing it inside the function.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Splitting identifyInterchangeSpace into two methods, one for source config and one for builtin.
Adding back isColorSpaceLinear inside Config.cpp since we need access to getProcessorWithoutCaching.
Refactor some of config utils function to return index instead of string.
Creating editable config in the two wrappers to prevent processor caching.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Tentative change to phase out isProcessorEquivalent.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Refactor code and add tests
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
* Remove unused method
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
* Remove unused method, tk 2
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
* Tweak comments
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
* Python binding for IdentifyInterchangeSpace and IdentifyBuiltinColorSpace methods.
Adding a couple python unit tests to cover the new methods (same unit test as the C++ side, but not all of them)
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* - Implementation of identifyInterchangeSpace, identifyBuiltinColorSpace and AreProcessorsEquivalent.
- Remove some include of Processor.h where it wasn't needed.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Moving code from Config.cpp to ConfigUtils.cpp and using wrapper in Config.cpp instead.
Fixing identations issues.
Fixing styling issues.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Typo and comments tweaks
Moving the creation of the editable config into the wrapper of isColorSpaceLinear instead of doing it inside the function.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Splitting identifyInterchangeSpace into two methods, one for source config and one for builtin.
Adding back isColorSpaceLinear inside Config.cpp since we need access to getProcessorWithoutCaching.
Refactor some of config utils function to return index instead of string.
Creating editable config in the two wrappers to prevent processor caching.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Tentative change to phase out isProcessorEquivalent.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Refactor code and add tests
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
* Remove unused method
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
* Remove unused method, tk 2
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
* Tweak comments
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
* Python binding for IdentifyInterchangeSpace and IdentifyBuiltinColorSpace methods.
Adding a couple python unit tests to cover the new methods (same unit test as the C++ side, but not all of them)
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fixing problem with the rebase
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Make sure the unit test is using the static method
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
---------
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Doug Walker <doug.walker@autodesk.com>
Signed-off-by: Cédrik Fuoco <105517825+cedrik-fuoco-adsk@users.noreply.github.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
* Changed OCIO_PYTHON_LOAD_DLLS_FROM_PATH to opt-in instead of opt-out
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Restrict the version of urllib3 to version <2 because version above this is not compatible with the OCIO container images
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Revert unwanted change from this branch
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
---------
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Implements isInactiveColorSpace and getRoleColorSpace.
Implements basic unit tests for those two methods.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Added header for the two new methods.
Added the python bindings equivalents.
Tweak C++ unit tests and added python unit tests.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Minimize usage for getRoleName
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Documentations
Moving the new unit tests
Adding extra tests for un-tested methods
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Tweaking unit tests and documentions
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fix build failure on Linux and Mac.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fix comment
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
---------
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
* Adding a method to clear the processor cache.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Do not clear the cache when enabling the cache
Adding test for the cache enable/disable cycle
Adding test to test clearProcessorCache
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Unrelated: Changing zlib version to 1.2.8 (adding it to this PR to minimize PRs)
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Documentations
Tweak unit tests
FIx implementation for clearProcessorCache
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Documentations
reverting zlib version and will do it in another PR
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Documentation and python binding
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Adding python unit tests and minor fixes
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Missing change from last commit
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
---------
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
* Fixinactive colorspaces in cg-config.
Fix OpenColorIO errors that was introduced a while ago in the unit test because of requirement for config.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Reverting changes in cg-config
Other warnings are not muted anymore when we check for role warnings.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Refactoring the new function in unit test log utils.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Integrating the code into LogGuard
Changing some misuses of StartsWith
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Adding a MuteLogging class for python side
Mute log from built-in config test
Comments
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Adding new utilities function to mute inactive colorspace info log while not muting all logs (C++ side)
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* findAllAndRemove method from LogGuard now takes a regex pattern instead of just the line to find
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
---------
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
* Tentative fix for macos failure
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* checking for llvm@15 instead as that version is installed by homebrew in the runner
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Trying to trigger the dependencies workflow by making a temporary changes in it.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Using same version of compiler as LLVM_ROOT when building OSL
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Adding LLVM_ROOT for macOS only and testing the usage of "llvm" only instead of llvm@15.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Changing back to llvm@15
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* last test to confirm
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* removing temporary change in dependencies_workflow
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
---------
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Implementation of ocio_find_package and ocio_install_package macro.
Implemention of minimum, maximum and recommended version.
Refactor the FindOpenImageIO to be inline with the rest of the custom find module (OCIO_USE_OIIO_CMAKE_CONFIG is no longer needed).
Added a new option called OCIO_VERBOSE. It allow the user to tell OCIO to display more information when searching and building the dependencies.
Splitted the find and install part into two files - Find<pkg>.cmake and Install<pkg>.cmake.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Removing a duplicate call to set_property in OpenImageIO find module.
Setting policy CMP0042 when building ZLIB since that project is using an old CMake version as the cmake_minimum_required and that version has no knowledge of the policy.
Fixing a potential issue in Installopenfx. Changing back the version to 1.4 as before.
Ignoring warning from OpenImageIO for imageioapphelpers. The same warning are ignored for ociodisplay, ocioconvert and ociolutimage.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fixed an issue with FindOpenImageIO that was found while testing on macOS.
Renamed FindOpenShadingLanguage to FindOSL to match the project name used the OSL's CMakefile.
Cleanup the code for FindOSL and removed duplicate warning about needed C++14.
Updated the header comments for all Find and Install modules.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fixing typo
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Renamed ocio_find_package to ocio_handle_dependency
Renamed ocio_install_package to ocio_install_dependency
The "Installing [...]" message from Install module is now under OCIO_VERBOSE variable. Added a message in ocio_install_dependency instead
Improve the colors usage in the logging
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Changed prefix for ocio_install_dependency since it was conflicting with the prefix of ocio_handle_dependency since they were the same.
Removed FindOpenEXR.cmake and FindOpenImageIO.cmake since they are not needed anymore (for differente reason).
Added PROMOTE_TARGET option for ocio_handle_dependency which promote the target to GLOBAL.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Mostly comments and documentations
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Small update of the Existing Install Hints section
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Changed RECOMMENDED_MIN_VERSION to RECOMMENDED_VERSION
Re-worded some of the comments
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fixing issue with ocio_handle_dependency macro where it wasn't respecting OCIO_INSTALL_EXT_PACKAGES option correctly.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Adding more documentations and dropping support to look for static zlib since the user can update their cmake in order to do that.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Documentations
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Documentations
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* fixing typo
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fix typo and fix issue when OCIO is installing ZLIB
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Tentative fix for Linux CI failure
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Ignoring specifics warnings on OpenImageIO target directly.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Removing OCIO_USE_OIIO_CMAKE_CONFIG as it is not needed anymore.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
---------
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Allow PyOpenColorIO module to load DLLs from Windows PATH environment variable with an opt-out option in case the user want the default behavior of Python 3.8+.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fixing typos in comments
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
---------
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
* - Refactoring how OCIO search for minizip-ng. The first step is to search for an external minizip-ng. If not found, search for minizip-ng with MZ_COMPAT=ON (libminizip). If it is not found either, download and install minizip-ng with MZ_COMPAT=OFF.
- Removing the minizip-ng part for the includes for minizip-ng headers.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Update comments
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Improved find_package in Config mode (adding it back)
Added missing scripts to install minizip-ng and zlib for the analysis workflow
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Adding +x permissions for install_minizip_ng and zlib
Fixing path to find zlib in install_minizip-ng.sh
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Changing target name to match the one used by minizip-ng library (+ using the imported target instead of creating a new one when minizip-ng is found)
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* First pass for the OpenColorIOConfig.cmake file with the required dependencies only.
A few extra fixes for OpenEXR, ZLIB and Minizip-ng.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Adding a informative message when building static ocio instead of per module.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Adding an extra step to test the consumer app with static OpenColorIO for Windows, Linux and MacOS.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Re-using the same test instead of creating a new one by removing the condition on build-shared.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fixing spacing, typo and adding back the NOT in the condition. (it was removed for debugging purpose)
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Changing directory where we share OCIO custom find modules (now in <install dir>/share/cmake/modules).
Adding a cmake macro when installing OCIO since it is needed by some custom find modules.
The find modules are only installed when building OCIO as a static library.
The config.cmake.in files now only looks for the dependency when OCIO was built as a static library.
Tentative (ci-workflow): Adding cmake-consumer test for static builds.
Overhaul of the Findzlib module to be more inline with the FindZLIB from cmake and to be more robust.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Adding missing backward slashes and saving the build path in an existing step instead of creating a new step.
Adding a check for CMake version for a section in Findzlib.cmake.
Re-phrasing some comments.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Prevent the download of the dependencies in the scenario where static OCIO is linked to a consumer project. Since OCIO_INSTALL_EXT_PACKAGES is not defined, our find module tries to download the dependencies, but we don't want that mecanism for consumer project.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Changing path where OCIO install its own custom find module.
Removing custom Findzlib and making modifications to use CMake FindZLIB.
Created a InstallZLIB module which does the download and install part if OCIO_INSTALL_EXT_PACAKGES is ALL or MISSING.
Tweaked config.cmake.in to use CMake FindZLIB.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Adding more details in comments
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Removing an extra "shell" property in CI workflow.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fix issues discovered with the failing CI workflow:
Cmake-consumer test now prefer the static version of the dependencies.
Fix an issue where yaml-cpp is not found by a consumer app (variable spelled incorectly in Findyaml-cpp).
Fix an issue expat library is not found by a consumer app on Windows.
Adding support for OCIO's <pkg_name>_STATIC_LIBRARY for ZLIB while supporting ZLIB_USE_STATIC_LIBS (CMake 3.24+) from CMake's FindZLIB.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Removing pystring_STATIC_LIBRARY does not exists in CI workflow.
Detecting if the build is Debug in the find module that OCIO installs since they can't rely on variables set by OCIO CMakefiles.
Fix issue with yaml-cpp library naming in debug.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fix issues on Windows with expat and minizip-ng library naming when building static OCIO.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Added option for macOS CI job in order to get more info on a failed job. Will be reverted once the issue is found.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Fixing a issue on macOS.
Improving ZLIB usage comments.
Bumping minizip-ng to the latest version - 3.0.7.
Bumping ZLIB to the latest version 2.1.13 to fix a vulnerability (CVE-2022-37434)
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Proposing to remove Findminizip module since external minizip-ng build need to be done with the same option as the internal build.
Otherwise, linking and symbols issues are going to happend if the other libraries are not linked in correctly.
It is going to simplify the maintainability of OCIO.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Removing findminizip.cmake from the install since it does not exist anymore.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Cédrik Fuoco <105517825+cedrik-fuoco-adsk@users.noreply.github.com>
* Configure the OpenColorIO.pc file on Windows and fix an issue where CMAKE_INSTALL_PREFIX wasn't included in the cmake build command in ocio.bat.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Removing pkconfig folder since that PC file is not used.
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Small tweak in the configuration of OpenColorIO.cmake.in to handle absolute path with CMAKE_INSTALL_LIBDIR or CMAKE_INSTALL_INCLUDEDIR.
Keeping exec_prefix for CMAKE_INSTALL_INCLUDE_DIR since it was changed for a specific issue on Mac (see PR #1120).
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
* Using ${prefix} for includedir
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Signed-off-by: Cédrik Fuoco <cedrik.fuoco@autodesk.com>
Co-authored-by: Doug Walker <doug.walker@autodesk.com>
