Cleanup: use 2 space indentation for CMake

1 files changed, 280 insertions, 280 deletions

diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake
index 4047a8f134d..3fd07f5b9c5 100644
--- a/build_files/cmake/platform/platform_apple.cmake
+++ b/build_files/cmake/platform/platform_apple.cmake
@@ -27,102 +27,102 @@ macro(find_package_wrapper)
 endmacro()
 
 if(NOT DEFINED LIBDIR)
-	set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin)
-	# Prefer lib directory paths
-	file(GLOB LIB_SUBDIRS ${LIBDIR}/*)
-	set(CMAKE_PREFIX_PATH ${LIB_SUBDIRS})
+  set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin)
+  # Prefer lib directory paths
+  file(GLOB LIB_SUBDIRS ${LIBDIR}/*)
+  set(CMAKE_PREFIX_PATH ${LIB_SUBDIRS})
 else()
-	message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
+  message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
 endif()
 if(NOT EXISTS "${LIBDIR}/")
-	message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
+  message(FATAL_ERROR "Mac OSX requires pre-compiled libs at: '${LIBDIR}'")
 endif()
 
 if(WITH_OPENAL)
-	find_package(OpenAL)
-	if(OPENAL_FOUND)
-		set(WITH_OPENAL ON)
-	else()
-		set(WITH_OPENAL OFF)
-	endif()
+  find_package(OpenAL)
+  if(OPENAL_FOUND)
+    set(WITH_OPENAL ON)
+  else()
+    set(WITH_OPENAL OFF)
+  endif()
 endif()
 
 if(WITH_ALEMBIC)
-	set(ALEMBIC ${LIBDIR}/alembic)
-	set(ALEMBIC_INCLUDE_DIR ${ALEMBIC}/include)
-	set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
-	set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
-	set(ALEMBIC_LIBRARIES Alembic)
-	set(ALEMBIC_FOUND ON)
+  set(ALEMBIC ${LIBDIR}/alembic)
+  set(ALEMBIC_INCLUDE_DIR ${ALEMBIC}/include)
+  set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
+  set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
+  set(ALEMBIC_LIBRARIES Alembic)
+  set(ALEMBIC_FOUND ON)
 endif()
 
 if(WITH_OPENSUBDIV)
-	set(OPENSUBDIV ${LIBDIR}/opensubdiv)
-	set(OPENSUBDIV_LIBPATH ${OPENSUBDIV}/lib)
-	find_library(OSD_LIB_CPU NAMES osdCPU PATHS ${OPENSUBDIV_LIBPATH})
-	find_library(OSD_LIB_GPU NAMES osdGPU PATHS ${OPENSUBDIV_LIBPATH})
-	set(OPENSUBDIV_INCLUDE_DIR ${OPENSUBDIV}/include)
-	set(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV_INCLUDE_DIR})
-	list(APPEND OPENSUBDIV_LIBRARIES ${OSD_LIB_CPU} ${OSD_LIB_GPU})
+  set(OPENSUBDIV ${LIBDIR}/opensubdiv)
+  set(OPENSUBDIV_LIBPATH ${OPENSUBDIV}/lib)
+  find_library(OSD_LIB_CPU NAMES osdCPU PATHS ${OPENSUBDIV_LIBPATH})
+  find_library(OSD_LIB_GPU NAMES osdGPU PATHS ${OPENSUBDIV_LIBPATH})
+  set(OPENSUBDIV_INCLUDE_DIR ${OPENSUBDIV}/include)
+  set(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV_INCLUDE_DIR})
+  list(APPEND OPENSUBDIV_LIBRARIES ${OSD_LIB_CPU} ${OSD_LIB_GPU})
 endif()
 
 if(WITH_JACK)
-	find_library(JACK_FRAMEWORK
-		NAMES jackmp
-	)
-	set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/headers)
-	if(NOT JACK_FRAMEWORK)
-		set(WITH_JACK OFF)
-	endif()
+  find_library(JACK_FRAMEWORK
+    NAMES jackmp
+  )
+  set(JACK_INCLUDE_DIRS ${JACK_FRAMEWORK}/headers)
+  if(NOT JACK_FRAMEWORK)
+    set(WITH_JACK OFF)
+  endif()
 endif()
 
 if(WITH_CODEC_SNDFILE)
-	set(LIBSNDFILE ${LIBDIR}/sndfile)
-	set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include)
-	set(LIBSNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc)
-	set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib)  # TODO, deprecate
+  set(LIBSNDFILE ${LIBDIR}/sndfile)
+  set(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE}/include)
+  set(LIBSNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc)
+  set(LIBSNDFILE_LIBPATH ${LIBSNDFILE}/lib ${LIBDIR}/ffmpeg/lib)  # TODO, deprecate
 endif()
 
 if(WITH_PYTHON)
-	# we use precompiled libraries for py 3.7 and up by default
-	set(PYTHON_VERSION 3.7)
-	if(NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
-		# normally cached but not since we include them with blender
-		set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
-		set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
-		set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}m.a)
-		set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
-		# set(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
-	else()
-		# module must be compiled against Python framework
-		set(_py_framework "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}")
-
-		set(PYTHON_INCLUDE_DIR "${_py_framework}/include/python${PYTHON_VERSION}m")
-		set(PYTHON_EXECUTABLE "${_py_framework}/bin/python${PYTHON_VERSION}m")
-		set(PYTHON_LIBPATH "${_py_framework}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}m")
-		#set(PYTHON_LIBRARY python${PYTHON_VERSION})
-		#set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python")  # won't  build with this enabled
-
-		unset(_py_framework)
-	endif()
-
-	# uncached vars
-	set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
-	set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")
-
-	# needed for Audaspace, numpy is installed into python site-packages
-	set(PYTHON_NUMPY_INCLUDE_DIRS "${PYTHON_LIBPATH}/site-packages/numpy/core/include")
-
-	if(NOT EXISTS "${PYTHON_EXECUTABLE}")
-		message(FATAL_ERROR "Python executable missing: ${PYTHON_EXECUTABLE}")
-	endif()
+  # we use precompiled libraries for py 3.7 and up by default
+  set(PYTHON_VERSION 3.7)
+  if(NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
+    # normally cached but not since we include them with blender
+    set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m")
+    set(PYTHON_EXECUTABLE "${LIBDIR}/python/bin/python${PYTHON_VERSION}m")
+    set(PYTHON_LIBRARY ${LIBDIR}/python/lib/libpython${PYTHON_VERSION}m.a)
+    set(PYTHON_LIBPATH "${LIBDIR}/python/lib/python${PYTHON_VERSION}")
+    # set(PYTHON_LINKFLAGS "-u _PyMac_Error")  # won't  build with this enabled
+  else()
+    # module must be compiled against Python framework
+    set(_py_framework "/Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}")
+
+    set(PYTHON_INCLUDE_DIR "${_py_framework}/include/python${PYTHON_VERSION}m")
+    set(PYTHON_EXECUTABLE "${_py_framework}/bin/python${PYTHON_VERSION}m")
+    set(PYTHON_LIBPATH "${_py_framework}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}m")
+    #set(PYTHON_LIBRARY python${PYTHON_VERSION})
+    #set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python")  # won't  build with this enabled
+
+    unset(_py_framework)
+  endif()
+
+  # uncached vars
+  set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
+  set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")
+
+  # needed for Audaspace, numpy is installed into python site-packages
+  set(PYTHON_NUMPY_INCLUDE_DIRS "${PYTHON_LIBPATH}/site-packages/numpy/core/include")
+
+  if(NOT EXISTS "${PYTHON_EXECUTABLE}")
+    message(FATAL_ERROR "Python executable missing: ${PYTHON_EXECUTABLE}")
+  endif()
 endif()
 
 if(WITH_FFTW3)
-	set(FFTW3 ${LIBDIR}/fftw3)
-	set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
-	set(FFTW3_LIBRARIES fftw3)
-	set(FFTW3_LIBPATH ${FFTW3}/lib)
+  set(FFTW3 ${LIBDIR}/fftw3)
+  set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
+  set(FFTW3_LIBRARIES fftw3)
+  set(FFTW3_LIBPATH ${FFTW3}/lib)
 endif()
 
 set(PNG_LIBRARIES png)
@@ -138,101 +138,101 @@ set(FREETYPE_LIBPATH ${FREETYPE}/lib)
 set(FREETYPE_LIBRARY freetype)
 
 if(WITH_IMAGE_OPENEXR)
-	set(OPENEXR ${LIBDIR}/openexr)
-	set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
-	set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR)
-	set(OPENEXR_LIBRARIES
-		Iex
-		Half
-		IlmImf
-		Imath
-		IlmThread)
-	set(OPENEXR_LIBPATH ${OPENEXR}/lib)
+  set(OPENEXR ${LIBDIR}/openexr)
+  set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
+  set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR)
+  set(OPENEXR_LIBRARIES
+    Iex
+    Half
+    IlmImf
+    Imath
+    IlmThread)
+  set(OPENEXR_LIBPATH ${OPENEXR}/lib)
 endif()
 
 if(WITH_CODEC_FFMPEG)
-	set(FFMPEG ${LIBDIR}/ffmpeg)
-	set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
-	set(FFMPEG_LIBRARIES
-		avcodec avdevice avformat avutil
-		mp3lame swscale x264 xvidcore
-		theora theoradec theoraenc
-		vorbis vorbisenc vorbisfile ogg
-		vpx swresample)
-	set(FFMPEG_LIBPATH ${FFMPEG}/lib)
+  set(FFMPEG ${LIBDIR}/ffmpeg)
+  set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
+  set(FFMPEG_LIBRARIES
+    avcodec avdevice avformat avutil
+    mp3lame swscale x264 xvidcore
+    theora theoradec theoraenc
+    vorbis vorbisenc vorbisfile ogg
+    vpx swresample)
+  set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 endif()
 
 if(WITH_IMAGE_OPENJPEG OR WITH_CODEC_FFMPEG)
-	# use openjpeg from libdir that is linked into ffmpeg
-	set(OPENJPEG ${LIBDIR}/openjpeg)
-	set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include)
-	set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjp2.a)
+  # use openjpeg from libdir that is linked into ffmpeg
+  set(OPENJPEG ${LIBDIR}/openjpeg)
+  set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include)
+  set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjp2.a)
 endif()
 
 find_library(SYSTEMSTUBS_LIBRARY
-	NAMES
-	SystemStubs
-	PATHS
+  NAMES
+  SystemStubs
+  PATHS
 )
 mark_as_advanced(SYSTEMSTUBS_LIBRARY)
 if(SYSTEMSTUBS_LIBRARY)
-	list(APPEND PLATFORM_LINKLIBS SystemStubs)
+  list(APPEND PLATFORM_LINKLIBS SystemStubs)
 endif()
 
 set(PLATFORM_CFLAGS "-pipe -funsigned-char")
 set(PLATFORM_LINKFLAGS
-	"-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio"
+  "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio"
 )
 
 list(APPEND PLATFORM_LINKLIBS c++)
 
 if(WITH_JACK)
-	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework jackmp")
+  set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework jackmp")
 endif()
 
 if(WITH_PYTHON_MODULE OR WITH_PYTHON_FRAMEWORK)
-	# force cmake to link right framework
-	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/Python")
+  # force cmake to link right framework
+  set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /Library/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/Python")
 endif()
 
 if(WITH_OPENCOLLADA)
-	set(OPENCOLLADA ${LIBDIR}/opencollada)
-
-	set(OPENCOLLADA_INCLUDE_DIRS
-		${LIBDIR}/opencollada/include/COLLADAStreamWriter
-		${LIBDIR}/opencollada/include/COLLADABaseUtils
-		${LIBDIR}/opencollada/include/COLLADAFramework
-		${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader
-		${LIBDIR}/opencollada/include/GeneratedSaxParser
-	)
-
-	set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
-	set(OPENCOLLADA_LIBRARIES
-		OpenCOLLADASaxFrameworkLoader
-		-lOpenCOLLADAFramework
-		-lOpenCOLLADABaseUtils
-		-lOpenCOLLADAStreamWriter
-		-lMathMLSolver
-		-lGeneratedSaxParser
-		-lbuffer -lftoa -lUTF
-		${OPENCOLLADA_LIBPATH}/libxml2.a
-	)
-	# PCRE is bundled with openCollada
-	#set(PCRE ${LIBDIR}/pcre)
-	#set(PCRE_LIBPATH ${PCRE}/lib)
-	set(PCRE_LIBRARIES pcre)
-	# libxml2 is used
-	#set(EXPAT ${LIBDIR}/expat)
-	#set(EXPAT_LIBPATH ${EXPAT}/lib)
-	set(EXPAT_LIB)
+  set(OPENCOLLADA ${LIBDIR}/opencollada)
+
+  set(OPENCOLLADA_INCLUDE_DIRS
+    ${LIBDIR}/opencollada/include/COLLADAStreamWriter
+    ${LIBDIR}/opencollada/include/COLLADABaseUtils
+    ${LIBDIR}/opencollada/include/COLLADAFramework
+    ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader
+    ${LIBDIR}/opencollada/include/GeneratedSaxParser
+  )
+
+  set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
+  set(OPENCOLLADA_LIBRARIES
+    OpenCOLLADASaxFrameworkLoader
+    -lOpenCOLLADAFramework
+    -lOpenCOLLADABaseUtils
+    -lOpenCOLLADAStreamWriter
+    -lMathMLSolver
+    -lGeneratedSaxParser
+    -lbuffer -lftoa -lUTF
+    ${OPENCOLLADA_LIBPATH}/libxml2.a
+  )
+  # PCRE is bundled with openCollada
+  #set(PCRE ${LIBDIR}/pcre)
+  #set(PCRE_LIBPATH ${PCRE}/lib)
+  set(PCRE_LIBRARIES pcre)
+  # libxml2 is used
+  #set(EXPAT ${LIBDIR}/expat)
+  #set(EXPAT_LIBPATH ${EXPAT}/lib)
+  set(EXPAT_LIB)
 endif()
 
 if(WITH_SDL)
-	set(SDL ${LIBDIR}/sdl)
-	set(SDL_INCLUDE_DIR ${SDL}/include)
-	set(SDL_LIBRARY SDL2)
-	set(SDL_LIBPATH ${SDL}/lib)
-	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework ForceFeedback")
+  set(SDL ${LIBDIR}/sdl)
+  set(SDL_INCLUDE_DIR ${SDL}/include)
+  set(SDL_LIBRARY SDL2)
+  set(SDL_LIBPATH ${SDL}/lib)
+  set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework ForceFeedback")
 endif()
 
 set(PNG "${LIBDIR}/png")
@@ -244,166 +244,166 @@ set(JPEG_INCLUDE_DIR "${JPEG}/include")
 set(JPEG_LIBPATH ${JPEG}/lib)
 
 if(WITH_IMAGE_TIFF)
-	set(TIFF ${LIBDIR}/tiff)
-	set(TIFF_INCLUDE_DIR ${TIFF}/include)
-	set(TIFF_LIBRARY tiff)
-	set(TIFF_LIBPATH ${TIFF}/lib)
+  set(TIFF ${LIBDIR}/tiff)
+  set(TIFF_INCLUDE_DIR ${TIFF}/include)
+  set(TIFF_LIBRARY tiff)
+  set(TIFF_LIBPATH ${TIFF}/lib)
 endif()
 
 if(WITH_BOOST)
-	set(BOOST ${LIBDIR}/boost)
-	set(BOOST_INCLUDE_DIR ${BOOST}/include)
-	set(BOOST_POSTFIX)
-	set(BOOST_LIBRARIES
-		boost_date_time${BOOST_POSTFIX}
-		boost_filesystem${BOOST_POSTFIX}
-		boost_regex${BOOST_POSTFIX}
-		boost_system${BOOST_POSTFIX}
-		boost_thread${BOOST_POSTFIX}
-		boost_wave${BOOST_POSTFIX}
-	)
-	if(WITH_INTERNATIONAL)
-		list(APPEND BOOST_LIBRARIES boost_locale${BOOST_POSTFIX})
-	endif()
-	if(WITH_CYCLES_NETWORK)
-		list(APPEND BOOST_LIBRARIES boost_serialization${BOOST_POSTFIX})
-	endif()
-	if(WITH_OPENVDB)
-		list(APPEND BOOST_LIBRARIES boost_iostreams${BOOST_POSTFIX})
-	endif()
-	set(BOOST_LIBPATH ${BOOST}/lib)
-	set(BOOST_DEFINITIONS)
+  set(BOOST ${LIBDIR}/boost)
+  set(BOOST_INCLUDE_DIR ${BOOST}/include)
+  set(BOOST_POSTFIX)
+  set(BOOST_LIBRARIES
+    boost_date_time${BOOST_POSTFIX}
+    boost_filesystem${BOOST_POSTFIX}
+    boost_regex${BOOST_POSTFIX}
+    boost_system${BOOST_POSTFIX}
+    boost_thread${BOOST_POSTFIX}
+    boost_wave${BOOST_POSTFIX}
+  )
+  if(WITH_INTERNATIONAL)
+    list(APPEND BOOST_LIBRARIES boost_locale${BOOST_POSTFIX})
+  endif()
+  if(WITH_CYCLES_NETWORK)
+    list(APPEND BOOST_LIBRARIES boost_serialization${BOOST_POSTFIX})
+  endif()
+  if(WITH_OPENVDB)
+    list(APPEND BOOST_LIBRARIES boost_iostreams${BOOST_POSTFIX})
+  endif()
+  set(BOOST_LIBPATH ${BOOST}/lib)
+  set(BOOST_DEFINITIONS)
 endif()
 
 if(WITH_INTERNATIONAL OR WITH_CODEC_FFMPEG)
-	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -liconv") # boost_locale and ffmpeg needs it !
+  set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -liconv") # boost_locale and ffmpeg needs it !
 endif()
 
 if(WITH_OPENIMAGEIO)
-	set(OPENIMAGEIO ${LIBDIR}/openimageio)
-	set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
-	set(OPENIMAGEIO_LIBRARIES
-		${OPENIMAGEIO}/lib/libOpenImageIO.a
-		${PNG_LIBRARIES}
-		${JPEG_LIBRARIES}
-		${TIFF_LIBRARY}
-		${OPENEXR_LIBRARIES}
-		${OPENJPEG_LIBRARIES}
-		${ZLIB_LIBRARIES}
-	)
-	set(OPENIMAGEIO_LIBPATH
-		${OPENIMAGEIO}/lib
-		${JPEG_LIBPATH}
-		${PNG_LIBPATH}
-		${TIFF_LIBPATH}
-		${OPENEXR_LIBPATH}
-		${ZLIB_LIBPATH}
-	)
-	set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
-	set(OPENIMAGEIO_IDIFF "${LIBDIR}/openimageio/bin/idiff")
+  set(OPENIMAGEIO ${LIBDIR}/openimageio)
+  set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
+  set(OPENIMAGEIO_LIBRARIES
+    ${OPENIMAGEIO}/lib/libOpenImageIO.a
+    ${PNG_LIBRARIES}
+    ${JPEG_LIBRARIES}
+    ${TIFF_LIBRARY}
+    ${OPENEXR_LIBRARIES}
+    ${OPENJPEG_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+  )
+  set(OPENIMAGEIO_LIBPATH
+    ${OPENIMAGEIO}/lib
+    ${JPEG_LIBPATH}
+    ${PNG_LIBPATH}
+    ${TIFF_LIBPATH}
+    ${OPENEXR_LIBPATH}
+    ${ZLIB_LIBPATH}
+  )
+  set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD")
+  set(OPENIMAGEIO_IDIFF "${LIBDIR}/openimageio/bin/idiff")
 endif()
 
 if(WITH_OPENCOLORIO)
-	set(OPENCOLORIO ${LIBDIR}/opencolorio)
-	set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
-	set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp)
-	set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
+  set(OPENCOLORIO ${LIBDIR}/opencolorio)
+  set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
+  set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp)
+  set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
 endif()
 
 if(WITH_OPENVDB)
-	set(OPENVDB ${LIBDIR}/openvdb)
-	set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include)
-	set(TBB_INCLUDE_DIRS ${LIBDIR}/tbb/include)
-	set(TBB_LIBRARIES ${LIBDIR}/tbb/lib/libtbb.a)
-	set(OPENVDB_LIBRARIES openvdb blosc ${TBB_LIBRARIES})
-	set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
-	set(OPENVDB_DEFINITIONS)
+  set(OPENVDB ${LIBDIR}/openvdb)
+  set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include)
+  set(TBB_INCLUDE_DIRS ${LIBDIR}/tbb/include)
+  set(TBB_LIBRARIES ${LIBDIR}/tbb/lib/libtbb.a)
+  set(OPENVDB_LIBRARIES openvdb blosc ${TBB_LIBRARIES})
+  set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
+  set(OPENVDB_DEFINITIONS)
 endif()
 
 if(WITH_LLVM)
-	set(LLVM_ROOT_DIR ${LIBDIR}/llvm)
-	set(LLVM_VERSION 3.4)
-	if(EXISTS "${LLVM_ROOT_DIR}/bin/llvm-config")
-		set(LLVM_CONFIG "${LLVM_ROOT_DIR}/bin/llvm-config")
-	else()
-		set(LLVM_CONFIG llvm-config)
-	endif()
-	execute_process(COMMAND ${LLVM_CONFIG} --version
-			OUTPUT_VARIABLE LLVM_VERSION
-			OUTPUT_STRIP_TRAILING_WHITESPACE)
-	execute_process(COMMAND ${LLVM_CONFIG} --prefix
-			OUTPUT_VARIABLE LLVM_ROOT_DIR
-			OUTPUT_STRIP_TRAILING_WHITESPACE)
-	execute_process(COMMAND ${LLVM_CONFIG} --libdir
-			OUTPUT_VARIABLE LLVM_LIBPATH
-			OUTPUT_STRIP_TRAILING_WHITESPACE)
-	find_library(LLVM_LIBRARY
-		      NAMES LLVMAnalysis # first of a whole bunch of libs to get
-		      PATHS ${LLVM_LIBPATH})
-
-	if(LLVM_LIBRARY AND LLVM_ROOT_DIR AND LLVM_LIBPATH)
-		if(LLVM_STATIC)
-			# if static LLVM libraries were requested, use llvm-config to generate
-			# the list of what libraries we need, and substitute that in the right
-			# way for LLVM_LIBRARY.
-			execute_process(COMMAND ${LLVM_CONFIG} --libfiles
-					OUTPUT_VARIABLE LLVM_LIBRARY
-					OUTPUT_STRIP_TRAILING_WHITESPACE)
-			string(REPLACE ".a /" ".a;/" LLVM_LIBRARY ${LLVM_LIBRARY})
-		else()
-			set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -lLLVM-3.4")
-		endif()
-	else()
-		message(FATAL_ERROR "LLVM not found.")
-	endif()
+  set(LLVM_ROOT_DIR ${LIBDIR}/llvm)
+  set(LLVM_VERSION 3.4)
+  if(EXISTS "${LLVM_ROOT_DIR}/bin/llvm-config")
+    set(LLVM_CONFIG "${LLVM_ROOT_DIR}/bin/llvm-config")
+  else()
+    set(LLVM_CONFIG llvm-config)
+  endif()
+  execute_process(COMMAND ${LLVM_CONFIG} --version
+      OUTPUT_VARIABLE LLVM_VERSION
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process(COMMAND ${LLVM_CONFIG} --prefix
+      OUTPUT_VARIABLE LLVM_ROOT_DIR
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  execute_process(COMMAND ${LLVM_CONFIG} --libdir
+      OUTPUT_VARIABLE LLVM_LIBPATH
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  find_library(LLVM_LIBRARY
+          NAMES LLVMAnalysis # first of a whole bunch of libs to get
+          PATHS ${LLVM_LIBPATH})
+
+  if(LLVM_LIBRARY AND LLVM_ROOT_DIR AND LLVM_LIBPATH)
+    if(LLVM_STATIC)
+      # if static LLVM libraries were requested, use llvm-config to generate
+      # the list of what libraries we need, and substitute that in the right
+      # way for LLVM_LIBRARY.
+      execute_process(COMMAND ${LLVM_CONFIG} --libfiles
+          OUTPUT_VARIABLE LLVM_LIBRARY
+          OUTPUT_STRIP_TRAILING_WHITESPACE)
+      string(REPLACE ".a /" ".a;/" LLVM_LIBRARY ${LLVM_LIBRARY})
+    else()
+      set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -lLLVM-3.4")
+    endif()
+  else()
+    message(FATAL_ERROR "LLVM not found.")
+  endif()
 endif()
 
 if(WITH_CYCLES_OSL)
-	set(CYCLES_OSL ${LIBDIR}/osl)
-
-	find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
-	find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
-	find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
-	# WARNING! depends on correct order of OSL libs linking
-	list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} -force_load ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
-	find_path(OSL_INCLUDE_DIR OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
-	find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
-
-	if(OSL_INCLUDE_DIR AND OSL_LIBRARIES AND OSL_COMPILER)
-		set(OSL_FOUND TRUE)
-	else()
-		message(STATUS "OSL not found")
-		set(WITH_CYCLES_OSL OFF)
-	endif()
+  set(CYCLES_OSL ${LIBDIR}/osl)
+
+  find_library(OSL_LIB_EXEC NAMES oslexec PATHS ${CYCLES_OSL}/lib)
+  find_library(OSL_LIB_COMP NAMES oslcomp PATHS ${CYCLES_OSL}/lib)
+  find_library(OSL_LIB_QUERY NAMES oslquery PATHS ${CYCLES_OSL}/lib)
+  # WARNING! depends on correct order of OSL libs linking
+  list(APPEND OSL_LIBRARIES ${OSL_LIB_COMP} -force_load ${OSL_LIB_EXEC} ${OSL_LIB_QUERY})
+  find_path(OSL_INCLUDE_DIR OSL/oslclosure.h PATHS ${CYCLES_OSL}/include)
+  find_program(OSL_COMPILER NAMES oslc PATHS ${CYCLES_OSL}/bin)
+
+  if(OSL_INCLUDE_DIR AND OSL_LIBRARIES AND OSL_COMPILER)
+    set(OSL_FOUND TRUE)
+  else()
+    message(STATUS "OSL not found")
+    set(WITH_CYCLES_OSL OFF)
+  endif()
 endif()
 
 if(WITH_CYCLES_EMBREE)
-	find_package(Embree 3.2.4 REQUIRED)
-	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Xlinker -stack_size -Xlinker 0x100000")
+  find_package(Embree 3.2.4 REQUIRED)
+  set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Xlinker -stack_size -Xlinker 0x100000")
 endif()
 
 # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
 if(WITH_OPENMP)
-	if(CMAKE_C_COMPILER_ID MATCHES "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
-		# Use OpenMP from our precompiled libraries.
-		message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
-		set(OPENMP_CUSTOM ON)
-		set(OPENMP_FOUND ON)
-		set(OpenMP_C_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
-		set(OpenMP_CXX_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
-		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L'${LIBDIR}/openmp/lib' -lomp")
-
-		# Copy libomp.dylib to allow executables like datatoc to work.
-		if(CMAKE_MAKE_PROGRAM MATCHES "xcodebuild")
-			set(OPENMP_DYLIB_AUX_PATH "${CMAKE_BINARY_DIR}/bin")
-		else()
-			set(OPENMP_DYLIB_AUX_PATH "${CMAKE_BINARY_DIR}")
-		endif()
-
-		execute_process(
-				COMMAND mkdir -p ${OPENMP_DYLIB_AUX_PATH}/Resources/lib
-				COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${OPENMP_DYLIB_AUX_PATH}/Resources/lib/libomp.dylib)
-	endif()
+  if(CMAKE_C_COMPILER_ID MATCHES "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
+    # Use OpenMP from our precompiled libraries.
+    message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
+    set(OPENMP_CUSTOM ON)
+    set(OPENMP_FOUND ON)
+    set(OpenMP_C_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
+    set(OpenMP_CXX_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L'${LIBDIR}/openmp/lib' -lomp")
+
+    # Copy libomp.dylib to allow executables like datatoc to work.
+    if(CMAKE_MAKE_PROGRAM MATCHES "xcodebuild")
+      set(OPENMP_DYLIB_AUX_PATH "${CMAKE_BINARY_DIR}/bin")
+    else()
+      set(OPENMP_DYLIB_AUX_PATH "${CMAKE_BINARY_DIR}")
+    endif()
+
+    execute_process(
+        COMMAND mkdir -p ${OPENMP_DYLIB_AUX_PATH}/Resources/lib
+        COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${OPENMP_DYLIB_AUX_PATH}/Resources/lib/libomp.dylib)
+  endif()
 endif()
 
 set(EXETYPE MACOSX_BUNDLE)
@@ -411,24 +411,24 @@ set(EXETYPE MACOSX_BUNDLE)
 set(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g")
 set(CMAKE_CXX_FLAGS_DEBUG "-fno-strict-aliasing -g")
 if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" OR CMAKE_OSX_ARCHITECTURES MATCHES "i386")
-	set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic -msse -msse2 -msse3 -mssse3")
-	set(CMAKE_C_FLAGS_RELEASE "-O2 -mdynamic-no-pic  -msse -msse2 -msse3 -mssse3")
-	if(NOT CMAKE_C_COMPILER_ID MATCHES "Clang")
-		set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ftree-vectorize  -fvariable-expansion-in-unroller")
-		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ftree-vectorize  -fvariable-expansion-in-unroller")
-	endif()
+  set(CMAKE_CXX_FLAGS_RELEASE "-O2 -mdynamic-no-pic -msse -msse2 -msse3 -mssse3")
+  set(CMAKE_C_FLAGS_RELEASE "-O2 -mdynamic-no-pic  -msse -msse2 -msse3 -mssse3")
+  if(NOT CMAKE_C_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -ftree-vectorize  -fvariable-expansion-in-unroller")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -ftree-vectorize  -fvariable-expansion-in-unroller")
+  endif()
 else()
-	set(CMAKE_C_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
-	set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
+  set(CMAKE_C_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
+  set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
 endif()
 
 if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
-	# Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
+  # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
 endif()
 # Get rid of eventually clashes, we export some symbols explicitly as local
 set(PLATFORM_LINKFLAGS
-	"${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker '${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map'"
+  "${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker '${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map'"
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")