Skip to content

Commit dd37e40

Browse files
committed
Try to disable more PyImath
1 parent cf41a4a commit dd37e40

3 files changed

Lines changed: 38 additions & 2 deletions

File tree

docker/ci-olive/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ COPY scripts/build_olive.sh /tmp/
7474

7575
# HACK: The ASWF Imath is compiled with Python support that we ignore to avoid an error:
7676
# set_property could not find TARGET Imath::PyImath_Python3_9.
77-
COPY scripts/DisableImathPythonRelease.patch /tmp/
77+
COPY scripts/DisableImathPython.patch scripts/DisableImathPythonRelease.patch /tmp/
78+
RUN patch -u /usr/local/lib64/cmake/Imath/ImathTargets.cmake /tmp/DisableImathPython.patch
7879
RUN patch -u /usr/local/lib64/cmake/Imath/ImathTargets-release.cmake /tmp/DisableImathPythonRelease.patch
7980

8081
RUN curl --location "https://github.com/probonopd/linuxdeployqt/releases/download/7/linuxdeployqt-7-x86_64.AppImage" \
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
--- ImathTargets.cmake 2022-05-25 22:12:51.000000000 +0000
2+
+++ ImathTargets.cmake 2023-03-10 11:53:26.509209000 +0000
3+
@@ -16,7 +16,7 @@
4+
set(_targetsDefined)
5+
set(_targetsNotDefined)
6+
set(_expectedTargets)
7+
-foreach(_expectedTarget Imath::ImathConfig Imath::Imath Imath::PyImathConfig Imath::PyImath_Python3_9)
8+
+foreach(_expectedTarget Imath::ImathConfig Imath::Imath) # Imath::PyImathConfig Imath::PyImath_Python3_9
9+
list(APPEND _expectedTargets ${_expectedTarget})
10+
if(NOT TARGET ${_expectedTarget})
11+
list(APPEND _targetsNotDefined ${_expectedTarget})
12+
@@ -67,16 +67,16 @@
13+
)
14+
15+
# Create imported target Imath::PyImathConfig
16+
-add_library(Imath::PyImathConfig INTERFACE IMPORTED)
17+
+#add_library(Imath::PyImathConfig INTERFACE IMPORTED)
18+
19+
# Create imported target Imath::PyImath_Python3_9
20+
-add_library(Imath::PyImath_Python3_9 SHARED IMPORTED)
21+
+#add_library(Imath::PyImath_Python3_9 SHARED IMPORTED)
22+
23+
-set_target_properties(Imath::PyImath_Python3_9 PROPERTIES
24+
- INTERFACE_COMPILE_FEATURES "cxx_std_14"
25+
- INTERFACE_INCLUDE_DIRECTORIES "/usr/local/include"
26+
- INTERFACE_LINK_LIBRARIES "Imath::Imath"
27+
-)
28+
+#set_target_properties(Imath::PyImath_Python3_9 PROPERTIES
29+
+# INTERFACE_COMPILE_FEATURES "cxx_std_14"
30+
+# INTERFACE_INCLUDE_DIRECTORIES "/usr/local/include"
31+
+# INTERFACE_LINK_LIBRARIES "Imath::Imath"
32+
+#)
33+
34+
if(CMAKE_VERSION VERSION_LESS 3.0.0)
35+
message(FATAL_ERROR "This file relies on consumers using CMake 3.0.0 or greater.")

docker/scripts/DisableImathPythonRelease.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--- ImathTargets-release.cmake 2022-05-25 22:12:51.000000000 +0000
2-
+++ rel.cmake 2022-12-10 21:25:53.362472000 +0000
2+
+++ ImathTargets-release.cmake 2022-12-10 21:25:53.362472000 +0000
33
@@ -15,16 +15,17 @@
44
list(APPEND _IMPORT_CHECK_TARGETS Imath::Imath )
55
list(APPEND _IMPORT_CHECK_FILES_FOR_Imath::Imath "${_IMPORT_PREFIX}/lib64/libImath-3_1.so.29.4.0" )

0 commit comments

Comments
 (0)