diff --git a/docker/ci-olive/Dockerfile b/docker/ci-olive/Dockerfile index fe65431a32..d27c4f3bae 100644 --- a/docker/ci-olive/Dockerfile +++ b/docker/ci-olive/Dockerfile @@ -74,7 +74,8 @@ COPY scripts/build_olive.sh /tmp/ # HACK: The ASWF Imath is compiled with Python support that we ignore to avoid an error: # set_property could not find TARGET Imath::PyImath_Python3_9. -COPY scripts/DisableImathPythonRelease.patch /tmp/ +COPY scripts/DisableImathPython.patch scripts/DisableImathPythonRelease.patch /tmp/ +RUN patch -u /usr/local/lib64/cmake/Imath/ImathTargets.cmake /tmp/DisableImathPython.patch RUN patch -u /usr/local/lib64/cmake/Imath/ImathTargets-release.cmake /tmp/DisableImathPythonRelease.patch RUN curl --location "https://github.com/probonopd/linuxdeployqt/releases/download/7/linuxdeployqt-7-x86_64.AppImage" \ diff --git a/docker/scripts/DisableImathPython.patch b/docker/scripts/DisableImathPython.patch new file mode 100644 index 0000000000..0f373486ab --- /dev/null +++ b/docker/scripts/DisableImathPython.patch @@ -0,0 +1,35 @@ +--- ImathTargets.cmake 2022-05-25 22:12:51.000000000 +0000 ++++ ImathTargets.cmake 2023-03-10 11:53:26.509209000 +0000 +@@ -16,7 +16,7 @@ + set(_targetsDefined) + set(_targetsNotDefined) + set(_expectedTargets) +-foreach(_expectedTarget Imath::ImathConfig Imath::Imath Imath::PyImathConfig Imath::PyImath_Python3_9) ++foreach(_expectedTarget Imath::ImathConfig Imath::Imath) # Imath::PyImathConfig Imath::PyImath_Python3_9 + list(APPEND _expectedTargets ${_expectedTarget}) + if(NOT TARGET ${_expectedTarget}) + list(APPEND _targetsNotDefined ${_expectedTarget}) +@@ -67,16 +67,16 @@ + ) + + # Create imported target Imath::PyImathConfig +-add_library(Imath::PyImathConfig INTERFACE IMPORTED) ++#add_library(Imath::PyImathConfig INTERFACE IMPORTED) + + # Create imported target Imath::PyImath_Python3_9 +-add_library(Imath::PyImath_Python3_9 SHARED IMPORTED) ++#add_library(Imath::PyImath_Python3_9 SHARED IMPORTED) + +-set_target_properties(Imath::PyImath_Python3_9 PROPERTIES +- INTERFACE_COMPILE_FEATURES "cxx_std_14" +- INTERFACE_INCLUDE_DIRECTORIES "/usr/local/include" +- INTERFACE_LINK_LIBRARIES "Imath::Imath" +-) ++#set_target_properties(Imath::PyImath_Python3_9 PROPERTIES ++# INTERFACE_COMPILE_FEATURES "cxx_std_14" ++# INTERFACE_INCLUDE_DIRECTORIES "/usr/local/include" ++# INTERFACE_LINK_LIBRARIES "Imath::Imath" ++#) + + if(CMAKE_VERSION VERSION_LESS 3.0.0) + message(FATAL_ERROR "This file relies on consumers using CMake 3.0.0 or greater.") \ No newline at end of file diff --git a/docker/scripts/DisableImathPythonRelease.patch b/docker/scripts/DisableImathPythonRelease.patch index 43d3d52784..1e50ea5126 100644 --- a/docker/scripts/DisableImathPythonRelease.patch +++ b/docker/scripts/DisableImathPythonRelease.patch @@ -1,5 +1,5 @@ --- ImathTargets-release.cmake 2022-05-25 22:12:51.000000000 +0000 -+++ rel.cmake 2022-12-10 21:25:53.362472000 +0000 ++++ ImathTargets-release.cmake 2022-12-10 21:25:53.362472000 +0000 @@ -15,16 +15,17 @@ list(APPEND _IMPORT_CHECK_TARGETS Imath::Imath ) list(APPEND _IMPORT_CHECK_FILES_FOR_Imath::Imath "${_IMPORT_PREFIX}/lib64/libImath-3_1.so.29.4.0" )