Skip to content

Commit 255a84f

Browse files
authored
build: Adjust pystring finding (#4816)
We have been having intermittent CI failures when the auto-build of OpenColorIO triggers the auto-build of Pystring, and then sometimes immediately seems to think the version it installed is not correct. I'm jiggling some things here to see if I can get it to stop occasionally failing. I've run the testsuite on this patch several times without seeing any failures that in recent days had been happening typically in 1-2 jobs per CI run. So maybe this fixes it? I'd be lying if I claimed to have a coherent and full explanation for exactly why these changes help. Signed-off-by: Larry Gritz <[email protected]>
1 parent ab2f988 commit 255a84f

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

src/cmake/build_pystring.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,13 @@ build_dependency_with_cmake(pystring
3030
)
3131

3232
set (pystring_VERSION ${pystring_BUILD_VERSION})
33+
unset (PYSTRING_LIBRARY)
34+
unset (PYSTRING_INCLUDE_DIR)
3335

34-
set (pystring_REFIND TRUE)
36+
set (pystring_REFIND FALSE)
3537
set (pystring_REFIND_VERSION ${pystring_BUILD_VERSION})
3638

3739

3840
if (pystring_BUILD_SHARED_LIBS)
3941
install_local_dependency_libs (pystring pystring)
40-
endif ()
42+
endif ()

0 commit comments

Comments
 (0)