Attachment #764845 for bug #821247

Lines 34-40 Link Here

(-)a/share/cmake/modules/FindExtPackages.cmake (-1 / +1 lines)
34		34
35	# Half (OpenEXR/IlmBase)	35	# Half (OpenEXR/IlmBase)
36	# https://github.com/openexr/openexr	36	# https://github.com/openexr/openexr
37	find_package(Half 2.4.0 REQUIRED)	37	find_package(Imath 3.0 REQUIRED)
38		38
39	# pystring	39	# pystring
40	# https://github.com/imageworks/pystring	40	# https://github.com/imageworks/pystring

Lines 7-13 Link Here

(-)a/src/OpenColorIO/BitDepthUtils.h (-1 / +1 lines)
7		7
8	#include <OpenColorIO/OpenColorIO.h>	8	#include <OpenColorIO/OpenColorIO.h>
9		9
10	#include "OpenEXR/half.h"	10	#include "Imath-3/half.h"
11		11
12		12
13	namespace OCIO_NAMESPACE	13	namespace OCIO_NAMESPACE

Lines 207-213 Link Here

(-)a/src/OpenColorIO/CMakeLists.txt (-1 / +1 lines)
207	public_api	207	public_api
208	PRIVATE	208	PRIVATE
209	expat::expat	209	expat::expat
210	IlmBase::Half	210	Imath::Imath
211	pystring::pystring	211	pystring::pystring
212	sampleicc::sampleicc	212	sampleicc::sampleicc
213	utils::strings	213	utils::strings

Lines 9-15 Link Here

(-)a/src/OpenColorIO/MathUtils.h (-1 / +1 lines)
9		9
10	#include <OpenColorIO/OpenColorIO.h>	10	#include <OpenColorIO/OpenColorIO.h>
11		11
12	#include "OpenEXR/half.h"	12	#include "Imath-3/half.h"
13		13
14	namespace OCIO_NAMESPACE	14	namespace OCIO_NAMESPACE
15	{	15	{

Lines 7-13 Link Here

(-)a/src/OpenColorIO/ops/range/RangeOp.cpp (-1 / +1 lines)
7	#include <OpenColorIO/OpenColorIO.h>	7	#include <OpenColorIO/OpenColorIO.h>
8		8
9	#include "GpuShaderUtils.h"	9	#include "GpuShaderUtils.h"
10	#include "OpenEXR/half.h"	10	#include "Imath-3/half.h"
11	#include "HashUtils.h"	11	#include "HashUtils.h"
12	#include "MathUtils.h"	12	#include "MathUtils.h"
13	#include "ops/lut1d/Lut1DOpData.h"	13	#include "ops/lut1d/Lut1DOpData.h"

Lines 6-12 Link Here

(-)a/src/OpenColorIO/transforms/builtins/ACES.cpp (-1 / +1 lines)
6		6
7	#include <OpenColorIO/OpenColorIO.h>	7	#include <OpenColorIO/OpenColorIO.h>
8		8
9	#include "OpenEXR/half.h"	9	#include "Imath-3/half.h"
10	#include "ops/fixedfunction/FixedFunctionOp.h"	10	#include "ops/fixedfunction/FixedFunctionOp.h"
11	#include "ops/gradingrgbcurve/GradingRGBCurveOp.h"	11	#include "ops/gradingrgbcurve/GradingRGBCurveOp.h"
12	#include "ops/log/LogOp.h"	12	#include "ops/log/LogOp.h"

Lines 4-10 Link Here

(-)a/src/OpenColorIO/transforms/builtins/OpHelpers.cpp (-1 / +1 lines)
4		4
5	#include <OpenColorIO/OpenColorIO.h>	5	#include <OpenColorIO/OpenColorIO.h>
6		6
7	#include "OpenEXR/half.h"	7	#include "Imath-3/half.h"
8	#include "ops/lut1d/Lut1DOp.h"	8	#include "ops/lut1d/Lut1DOp.h"
9	#include "transforms/builtins/OpHelpers.h"	9	#include "transforms/builtins/OpHelpers.h"
10		10

Lines 27-33 Link Here

(-)a/src/apps/ocioconvert/CMakeLists.txt (-1 / +1 lines)
27	target_link_libraries(ocioconvert	27	target_link_libraries(ocioconvert
28	PRIVATE	28	PRIVATE
29	apputils	29	apputils
30	IlmBase::Half	30	Imath::Imath
31	${OCIO_GL_LIB}	31	${OCIO_GL_LIB}
32	oiiohelpers	32	oiiohelpers
33	OpenColorIO	33	OpenColorIO

Lines 24-30 Link Here

(-)a/src/apps/ocioconvert/main.cpp (-1 / +1 lines)
24	#endif // OCIO_GPU_ENABLED	24	#endif // OCIO_GPU_ENABLED
25		25
26	#include "oiiohelpers.h"	26	#include "oiiohelpers.h"
27	#include "OpenEXR/half.h"	27	#include "Imath-3/half.h"
28		28
29		29
30	// Array of non OpenColorIO arguments.	30	// Array of non OpenColorIO arguments.

Lines 20-26 Link Here

(-)a/src/apps/ocioperf/CMakeLists.txt (-1 / +1 lines)
20	target_link_libraries(ocioperf	20	target_link_libraries(ocioperf
21	PRIVATE	21	PRIVATE
22	apputils	22	apputils
23	IlmBase::Half	23	Imath::Imath
24	oiiohelpers	24	oiiohelpers
25	OpenColorIO	25	OpenColorIO
26	OpenImageIO::OpenImageIO	26	OpenImageIO::OpenImageIO

Lines 11-17 Link Here

(-)a/src/apps/ocioperf/main.cpp (-1 / +1 lines)
11	#endif	11	#endif
12		12
13	#include "apputils/argparse.h"	13	#include "apputils/argparse.h"
14	#include "OpenEXR/half.h"	14	#include "Imath-3/half.h"
15	#include "oiiohelpers.h"	15	#include "oiiohelpers.h"
16	#include "utils/StringUtils.h"	16	#include "utils/StringUtils.h"
17		17

Lines 31-37 Link Here

(-)a/src/libutils/oiiohelpers/CMakeLists.txt (-1 / +1 lines)
31		31
32	PRIVATE	32	PRIVATE
33	OpenColorIO	33	OpenColorIO
34	IlmBase::Half	34	Imath::Imath
35	utils::strings	35	utils::strings
36	)	36	)
37		37

Lines 5-11 Link Here

(-)a/src/libutils/oiiohelpers/oiiohelpers.cpp (-1 / +1 lines)
5	#include <OpenColorIO/OpenColorIO.h>	5	#include <OpenColorIO/OpenColorIO.h>
6		6
7		7
8	#include "OpenEXR/half.h"	8	#include "Imath-3/half.h"
9	#include "oiiohelpers.h"	9	#include "oiiohelpers.h"
10	#include "utils/StringUtils.h"	10	#include "utils/StringUtils.h"
11		11

Lines 18-24 Link Here

(-)a/tests/cpu/CMakeLists.txt (-1 / +1 lines)
18	public_api	18	public_api
19	PRIVATE	19	PRIVATE
20	expat::expat	20	expat::expat
21	IlmBase::Half	21	Imath::Imath
22	pystring::pystring	22	pystring::pystring
23	sampleicc::sampleicc	23	sampleicc::sampleicc
24	unittest_data	24	unittest_data

Return to bug 821247