Attachment #471284 for bug #596268

Lines 519-528 Link Here

(-)openimageio-1.7.13/CMakeLists.txt.orig (-2 / +2 lines)
519	endforeach ()	519	endforeach ()
520	endif ()	520	endif ()
521		521
522	if (USE_PYTHON AND boost_PYTHON_FOUND AND NOT BUILD_OIIOUTIL_ONLY)	522	if (USE_PYTHON AND Boost_PYTHON_FOUND AND NOT BUILD_OIIOUTIL_ONLY)
523	add_subdirectory (src/python)	523	add_subdirectory (src/python)
524	endif ()	524	endif ()
525	if (USE_PYTHON3 AND boost_PYTHON_FOUND AND NOT BUILD_OIIOUTIL_ONLY)	525	if (USE_PYTHON3 AND Boost_PYTHON_FOUND AND NOT BUILD_OIIOUTIL_ONLY)
526	#build the python3 module in a different binary directory since it will	526	#build the python3 module in a different binary directory since it will
527	#have the same name as the python2 module (e.g. OpenImageIO.so)	527	#have the same name as the python2 module (e.g. OpenImageIO.so)
528	add_subdirectory (src/python src/python3)	528	add_subdirectory (src/python src/python3)

Lines 135-140 Link Here

(-)openimageio-1.7.13/src/cmake/externalpackages.cmake.orig (-4 / +9 lines)
135	COMPONENTS ${Boost_COMPONENTS}	135	COMPONENTS ${Boost_COMPONENTS}
136	)	136	)
137		137
		138	if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
		139	# Gentoo's patches to CMake make sure that we will always find exactly the version of Python required by Gentoo
		140	find_package (Boost 1.42 COMPONENTS ${Boost_COMPONENTS} python)
		141	else ()
138	# Try to figure out if this boost distro has Boost::python. If we	142	# Try to figure out if this boost distro has Boost::python. If we
139	# include python in the component list above, cmake will abort if	143	# include python in the component list above, cmake will abort if
140	# it's not found. So we resort to checking for the boost_python	144	# it's not found. So we resort to checking for the boost_python
Lines 172-181 Link Here
172	endif ()	176	endif ()
173	if (my_boost_python_lib OR	177	if (my_boost_python_lib OR
174	my_boost_PYTHON_LIBRARY_RELEASE OR my_boost_PYTHON_LIBRARY_DEBUG)	178	my_boost_PYTHON_LIBRARY_RELEASE OR my_boost_PYTHON_LIBRARY_DEBUG)
175	set (boost_PYTHON_FOUND ON)	179	set (Boost_PYTHON_FOUND ON)
176	else ()	180	else ()
177	set (boost_PYTHON_FOUND OFF)	181	set (Boost_PYTHON_FOUND OFF)
178	endif ()	182	endif ()
		183	endif ()
179	endif ()	184	endif ()
180		185
181	# On Linux, Boost 1.55 and higher seems to need to link against -lrt	186	# On Linux, Boost 1.55 and higher seems to need to link against -lrt
Lines 190-198 Link Here
190	message (STATUS "Boost include dirs ${Boost_INCLUDE_DIRS}")	195	message (STATUS "Boost include dirs ${Boost_INCLUDE_DIRS}")
191	message (STATUS "Boost library dirs ${Boost_LIBRARY_DIRS}")	196	message (STATUS "Boost library dirs ${Boost_LIBRARY_DIRS}")
192	message (STATUS "Boost libraries ${Boost_LIBRARIES}")	197	message (STATUS "Boost libraries ${Boost_LIBRARIES}")
193	message (STATUS "Boost python found ${boost_PYTHON_FOUND}")	198	message (STATUS "Boost python found ${Boost_PYTHON_FOUND}")
194	endif ()	199	endif ()
195	if (NOT boost_PYTHON_FOUND)	200	if (NOT Boost_PYTHON_FOUND)
196	# If Boost python components were not found, turn off all python support.	201	# If Boost python components were not found, turn off all python support.
197	message (STATUS "Boost python support not found -- will not build python components!")	202	message (STATUS "Boost python support not found -- will not build python components!")
198	if (APPLE AND USE_PYTHON)	203	if (APPLE AND USE_PYTHON)

Lines 8-14 Link Here

(-)openimageio-1.7.13/src/python/CMakeLists.txt.orig (-1 / +8 lines)
8	set (BUILD_PY3 OFF)	8	set (BUILD_PY3 OFF)
9	endif ()	9	endif ()
10		10
11	if (NOT BOOST_CUSTOM AND NOT BUILD_PY3)	11	if (CMAKE_GENTOO_BUILD OR CMAKE_BUILD_TYPE STREQUAL Gentoo)
		12	# Gentoo's patches to CMake make sure that we will always find exactly the version of Python required by Gentoo
		13	if (BUILD_PY3)
		14	find_package (PythonInterp ${PYTHON3_VERSION} REQUIRED)
		15	find_package (PythonLibs ${PYTHON3_VERSION} REQUIRED)
		16	endif ()
		17	find_package (Boost 1.42 REQUIRED COMPONENTS python)
		18	elseif (NOT BOOST_CUSTOM AND NOT BUILD_PY3)
12	#Unset those, otherwise find_package(PythonLibs) will pick up old stuff	19	#Unset those, otherwise find_package(PythonLibs) will pick up old stuff
13	#if it has been run before	20	#if it has been run before
14	unset(Python_ADDITIONAL_VERSIONS)	21	unset(Python_ADDITIONAL_VERSIONS)

Return to bug 596268