Skip to content

Commit b2de0de

Browse files
committed
Debug
1 parent c5f8ffc commit b2de0de

File tree

5 files changed

+24
-4
lines changed

5 files changed

+24
-4
lines changed

.github/workflows/wheel_workflow.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jobs:
7676
# github.event_name != 'schedule' ||
7777
# github.repository == 'AcademySoftwareFoundation/OpenColorIO'
7878
strategy:
79+
fail-fast: false
7980
matrix:
8081
include:
8182
# -------------------------------------------------------------------
@@ -165,6 +166,7 @@ jobs:
165166
# github.event_name != 'schedule' ||
166167
# github.repository == 'AcademySoftwareFoundation/OpenColorIO'
167168
strategy:
169+
fail-fast: false
168170
matrix:
169171
include:
170172
# -------------------------------------------------------------------
@@ -337,6 +339,7 @@ jobs:
337339
# github.event_name != 'schedule' ||
338340
# github.repository == 'AcademySoftwareFoundation/OpenColorIO'
339341
strategy:
342+
fail-fast: false
340343
matrix:
341344
include:
342345
# -------------------------------------------------------------------

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ def build_extension(self, ext):
106106
"-DOCIO_BUILD_GPU_TESTS=OFF",
107107
# Make sure we build everything for the requested architecture(s)
108108
"-DOCIO_INSTALL_EXT_PACKAGES=ALL",
109+
"-DCMAKE_VERBOSE_MAKEFILE=ON",
109110
]
110111
build_args = []
111112
# Adding CMake arguments set as environment variable

share/cmake/macros/GetPythonPreCommand.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ macro(get_python_pre_command)
6262
# '\n' is here because '\\&' does not work.
6363
set(Python_PRE_CMD set ${_PATH_SET} "\n" set ${_PYTHONPATH_SET} "\n" call)
6464

65+
message(STATUS "Python pre-command: ${Python_PRE_CMD}")
66+
6567
else()
6668
# Build path list
6769
set(_PATHS
@@ -76,6 +78,8 @@ macro(get_python_pre_command)
7678
string(JOIN ":" _PYTHONPATH_VALUE ${_PATHS})
7779
set(Python_PRE_CMD "PYTHONPATH=${_PYTHONPATH_VALUE}")
7880

81+
message(STATUS "Python pre-command: ${Python_PRE_CMD}")
82+
7983
endif()
8084

8185
endmacro()

share/cmake/modules/install/InstallImath.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,11 @@ if(NOT Imath_FOUND AND OCIO_INSTALL_EXT_PACKAGES AND NOT OCIO_INSTALL_EXT_PACKAG
8383
-DPYTHON=OFF
8484
-DDOCS=OFF
8585
-DIMATH_HALF_USE_LOOKUP_TABLE=OFF
86+
-DCMAKE_VERBOSE_MAKEFILE=ON
8687
)
8788

89+
message(STATUS "Imath: ${Imath_CMAKE_ARGS}")
90+
8891
if(CMAKE_TOOLCHAIN_FILE)
8992
set(Imath_CMAKE_ARGS
9093
${Imath_CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
@@ -130,9 +133,9 @@ if(NOT Imath_FOUND AND OCIO_INSTALL_EXT_PACKAGES AND NOT OCIO_INSTALL_EXT_PACKAG
130133

131134
add_dependencies(Imath::Imath imath_install)
132135

133-
if(OCIO_VERBOSE)
136+
# if(OCIO_VERBOSE)
134137
message(STATUS "Installing Imath: ${Imath_LIBRARY} (version \"${Imath_VERSION}\")")
135-
endif()
138+
# endif()
136139
endif()
137140
endif()
138141

share/cmake/modules/install/InstallOpenEXR.cmake

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,16 @@ if(NOT OpenEXR_FOUND AND OCIO_INSTALL_EXT_PACKAGES AND NOT OCIO_INSTALL_EXT_PACK
110110
-DBUILD_SHARED_LIBS=OFF
111111
-DBUILD_TESTING=OFF
112112
-DOPENEXR_INSTALL_EXAMPLES=OFF
113+
-DOPENEXR_BUILD_EXAMPLES=OFF
113114
-DOPENEXR_BUILD_TOOLS=OFF
115+
-DCMAKE_FIND_DEBUG_MODE=TRUE
114116
# Try to use in-source built Imath first, if available.
115117
-DCMAKE_PREFIX_PATH=${_EXT_DIST_ROOT}
118+
-DCMAKE_VERBOSE_MAKEFILE=ON
116119
)
117120

121+
message(STATUS "OpenEXR_CMAKE_ARGS: ${OpenEXR_CMAKE_ARGS}")
122+
118123
set(OpenEXR_CMAKE_ARGS ${OpenEXR_CMAKE_ARGS} -DOPENEXR_FORCE_INTERNAL_DEFLATE=ON)
119124

120125
if(CMAKE_TOOLCHAIN_FILE)
@@ -179,9 +184,13 @@ if(NOT OpenEXR_FOUND AND OCIO_INSTALL_EXT_PACKAGES AND NOT OCIO_INSTALL_EXT_PACK
179184

180185
add_dependencies(OpenEXR::OpenEXR openexr_install)
181186

182-
if(OCIO_VERBOSE)
183-
message(STATUS "Installing OpenEXR: ${OpenEXR_LIBRARY} (version \"${OpenEXR_VERSION}\")")
187+
if (TARGET imath_install)
188+
add_dependencies(openexr_install imath_install)
184189
endif()
190+
191+
# if(OCIO_VERBOSE)
192+
message(STATUS "Installing OpenEXR: ${OpenEXR_LIBRARY} (version \"${OpenEXR_VERSION}\")")
193+
# endif()
185194
endif()
186195
endif()
187196

0 commit comments

Comments
 (0)