Cleanup

Author: remia

.github/workflows/ci_workflow.yml

@@ -766,7 +766,7 @@ jobs:
           - build: 3
             build-type: Release
             build-shared: 'OFF'
-            build-docs: 'OFF'
+            build-docs: 'ON'
             build-openfx: 'OFF'
             use-simd: 'ON'
             use-oiio: 'OFF'

.github/workflows/dependencies_latest.yml

@@ -189,8 +189,9 @@ jobs:
         run: share/ci/scripts/macos/install_tests_env.sh
       - name: Setup ext environment
         run: |
-          EXT_PATH=/usr/local
+          EXT_PATH=$GITHUB_WORKSPACE/_ext
           echo "EXT_PATH=$EXT_PATH" >> $GITHUB_ENV
+          echo "CMAKE_PREFIX_PATH=$EXT_PATH" >> $GITHUB_ENV
       - name: Install fixed ext package versions
         # Minizip-ng depends on ZLIB. ZLIB must be installed first.
         run: |
@@ -240,6 +241,7 @@ jobs:
                 -DCMAKE_BUILD_TYPE=Release
           cmake --build . \
                 --config Release
+          export DYLD_LIBRARY_PATH=$EXT_PATH/lib:$DYLD_LIBRARY_PATH
           ./consumer
         working-directory: _build/tests/cmake-consumer-dist
 

share/ci/scripts/multi/install_expat.sh

@@ -38,20 +38,10 @@ cmake -DCMAKE_BUILD_TYPE=Release \
       -DEXPAT_BUILD_DOCS=OFF \
       -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
       ../expat/.
-
-# Expat 2.7.2 yield a permission error on mac OS.
-# "file cannot create directory: /usr/local/include.  Maybe need administrative privileges."
-if [[ $OSTYPE == 'darwin'* ]]; then
-sudo cmake --build . \
-      --target install \
-      --config Release \
-      --parallel 2
-else # not macOS
 cmake --build . \
       --target install \
       --config Release \
       --parallel 2
-fi
 
 cd ../..
 rm -rf libexpat

share/ci/scripts/multi/install_lcms2.sh

@@ -26,18 +26,10 @@ cmake -DCMAKE_BUILD_TYPE=Release \
       -DBUILD_SHARED_LIBS=ON \
       -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
       ../.
-
-if [[ $OSTYPE == 'darwin'* ]]; then
-sudo cmake --build . \
-      --target install \
-      --config Release \
-      --parallel 2
-else # not macOS
 cmake --build . \
       --target install \
       --config Release \
       --parallel 2
-fi
 
 cd ../..
 rm -rf Little-CMS

share/cmake/macros/GetPythonPreCommand.cmake

@@ -66,9 +66,7 @@ macro(get_python_pre_command)
         # on Windows with:
         #   '> set PYTHONPATH=XXX \n call CMD'
         # '\n' is here because '\\&' does not work.
-        set(Python_PRE_CMD set ${_PATH_SET} "\n" call)
-
-        message(STATUS "Python pre-command: ${Python_PRE_CMD}")
+        set(Python_PRE_CMD set ${_PATH_SET} "\n" set ${_PYTHONPATH_SET} "\n" call)
 
     else()
         # Build path list
@@ -84,8 +82,6 @@ macro(get_python_pre_command)
         string(JOIN  ":" _PYTHONPATH_VALUE ${_PATHS})
         set(Python_PRE_CMD "PYTHONPATH=${_PYTHONPATH_VALUE}")
 
-        message(STATUS "Python pre-command: ${Python_PRE_CMD}")
-
     endif()
 
 endmacro()

share/cmake/modules/FindExtPackages.cmake

@@ -55,7 +55,7 @@ message(STATUS "Checking for mandatory dependencies...")
 # expat
 # https://github.com/libexpat/libexpat
 ocio_handle_dependency(  expat REQUIRED ALLOW_INSTALL
-                         MIN_VERSION 2.4.1           # 2.6.0 maybe? As it's cmake 4.0 friendly
+                         MIN_VERSION 2.6.0
                          RECOMMENDED_VERSION 2.7.2
                          RECOMMENDED_VERSION_REASON "CVE fixes and Latest version tested with OCIO")
 
@@ -73,7 +73,7 @@ ocio_handle_dependency(  pystring REQUIRED ALLOW_INSTALL
                          RECOMMENDED_VERSION 1.1.4
                          RECOMMENDED_VERSION_REASON "Latest version tested with OCIO")
 
-# Imath (>=3.1.1)
+# Imath
 # https://github.com/AcademySoftwareFoundation/Imath
 ocio_handle_dependency(  Imath REQUIRED ALLOW_INSTALL
                          MIN_VERSION 3.1.1
@@ -108,7 +108,7 @@ ocio_handle_dependency(  ZLIB REQUIRED ALLOW_INSTALL
 # minizip-ng
 # https://github.com/zlib-ng/minizip-ng
 ocio_handle_dependency(  minizip-ng REQUIRED ALLOW_INSTALL
-                         MIN_VERSION 3.0.8
+                         MIN_VERSION 4.0.0
                          RECOMMENDED_VERSION 4.0.10
                          RECOMMENDED_VERSION_REASON "Latest version tested with OCIO")
 
@@ -255,7 +255,7 @@ if(OCIO_BUILD_APPS)
         ###############################################################################
         # Calling find_package in CONFIG mode using PREFER_CONFIG option.
         ocio_handle_dependency(  OpenEXR PREFER_CONFIG ALLOW_INSTALL
-                                 MIN_VERSION 3.1.6
+                                 MIN_VERSION 3.2.0
                                  RECOMMENDED_VERSION 3.3.5
                                  RECOMMENDED_VERSION_REASON "Latest version tested with OCIO"
                                  PROMOTE_TARGET OpenEXR::OpenEXR)

share/cmake/modules/Findminizip-ng.cmake

@@ -115,7 +115,6 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
             PATH_SUFFIXES
                 include
                 include/minizip-ng
-                include/minizip-ng/minizip-ng
                 include/minizip
                 minizip-ng/include
                 minizip/include

share/cmake/modules/install/Installminizip-ng.cmake

@@ -42,8 +42,7 @@ if(NOT minizip-ng_FOUND AND OCIO_INSTALL_EXT_PACKAGES AND NOT OCIO_INSTALL_EXT_P
         set(minizip-ng_VERSION ${minizip-ng_FIND_VERSION})
     endif()
 
-    # TODO: Only from a specific version?
-    set(minizip-ng_INCLUDE_DIR "${_EXT_DIST_ROOT}/${CMAKE_INSTALL_INCLUDEDIR}/minizip-ng/minizip-ng")
+    set(minizip-ng_INCLUDE_DIR "${_EXT_DIST_ROOT}/${CMAKE_INSTALL_INCLUDEDIR}/minizip-ng")
 
     # Minizip-ng use a hardcoded lib prefix instead of CMAKE_STATIC_LIBRARY_PREFIX
     # Fixed from 4.0.7, see https://github.com/zlib-ng/minizip-ng/issues/778
@@ -69,11 +68,6 @@ if(NOT minizip-ng_FOUND AND OCIO_INSTALL_EXT_PACKAGES AND NOT OCIO_INSTALL_EXT_P
             -DCMAKE_INSTALL_BINDIR=${CMAKE_INSTALL_BINDIR}
             -DCMAKE_INSTALL_DATADIR=${CMAKE_INSTALL_DATADIR}
             -DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
-            # Since the other modules create a subfolder for the includes by default and since
-            # minizip-ng does not, a suffix is added to CMAKE_INSTALL_INCLUDEDIR in order to
-            # install the headers under a subdirectory named "minizip-ng".
-            # Note that this does not affect external builds for minizip-ng.
-            -DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}/minizip-ng
             -DCMAKE_OBJECT_PATH_MAX=${CMAKE_OBJECT_PATH_MAX}
             -DBUILD_SHARED_LIBS=OFF
             -DMZ_OPENSSL=OFF

src/bindings/python/CMakeLists.txt

@@ -22,7 +22,7 @@ if(OCIO_BUILD_DOCS)
 	# Run docstring extraction if docstrings.h is behind doxygen XML
 	add_custom_command(OUTPUT ${PYOCIO_DOCSTRINGS_H}
 		COMMAND
-			${Python_PRE_CMD} "${Python_EXECUTABLE}" -v "${EXTRACT_DOCSTRINGS_PY}" xml docstrings.h
+			${Python_PRE_CMD} "${Python_EXECUTABLE}" "${EXTRACT_DOCSTRINGS_PY}" xml docstrings.h
 		WORKING_DIRECTORY
 			${PYOCIO_DOCSTRINGS_DIR}
 		DEPENDS