Cleanup: use 2 space indentation for CMake

70 files changed, 2375 insertions, 2375 deletions

diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index 1760e00e150..c21ed826736 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -47,13 +47,13 @@ include(cmake/options.cmake)
 include(cmake/versions.cmake)
 
 if(ENABLE_MINGW64)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		include(cmake/setup_mingw64.cmake)
-	else()
-		include(cmake/setup_mingw32.cmake)
-	endif()
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    include(cmake/setup_mingw64.cmake)
+  else()
+    include(cmake/setup_mingw32.cmake)
+  endif()
 else()
-	set(mingw_LIBDIR ${LIBDIR})
+  set(mingw_LIBDIR ${LIBDIR})
 endif()
 
 include(cmake/zlib.cmake)
@@ -94,61 +94,61 @@ include(cmake/numpy.cmake)
 include(cmake/pugixml.cmake)
 
 if(WITH_WEBP)
-	include(cmake/webp.cmake)
+  include(cmake/webp.cmake)
 endif()
 
 if(WITH_EMBREE)
-	include(cmake/embree.cmake)
+  include(cmake/embree.cmake)
 endif()
 
 if(WIN32)
-	# HMD branch deps
-	include(cmake/hidapi.cmake)
-	# OCIO deps
-	include(cmake/tinyxml.cmake)
-	include(cmake/yamlcpp.cmake)
-	# LCMS is an OCIO dep, but only if you build the apps, leaving it here for convenience
-	#include(cmake/lcms.cmake)
+  # HMD branch deps
+  include(cmake/hidapi.cmake)
+  # OCIO deps
+  include(cmake/tinyxml.cmake)
+  include(cmake/yamlcpp.cmake)
+  # LCMS is an OCIO dep, but only if you build the apps, leaving it here for convenience
+  #include(cmake/lcms.cmake)
 
 endif()
 
 if(NOT WIN32 OR ENABLE_MINGW64)
-	include(cmake/openjpeg.cmake)
-	if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
-		if(WIN32)
-			include(cmake/zlib_mingw.cmake)
-		endif()
-		include(cmake/lame.cmake)
-		include(cmake/ogg.cmake)
-		include(cmake/vorbis.cmake)
-		include(cmake/theora.cmake)
-		include(cmake/vpx.cmake)
-		include(cmake/x264.cmake)
-		include(cmake/xvidcore.cmake)
-		include(cmake/faad.cmake)
-		include(cmake/ffmpeg.cmake)
-		include(cmake/fftw.cmake)
-		include(cmake/sndfile.cmake)
-		if(WIN32)
-			include(cmake/iconv.cmake)
-		endif()
-		if(UNIX)
-			include(cmake/flac.cmake)
-			include(cmake/xml2.cmake)
-			if(NOT APPLE)
-				include(cmake/spnav.cmake)
-				include(cmake/jemalloc.cmake)
-			endif()
-		endif()
-	endif()
+  include(cmake/openjpeg.cmake)
+  if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
+    if(WIN32)
+      include(cmake/zlib_mingw.cmake)
+    endif()
+    include(cmake/lame.cmake)
+    include(cmake/ogg.cmake)
+    include(cmake/vorbis.cmake)
+    include(cmake/theora.cmake)
+    include(cmake/vpx.cmake)
+    include(cmake/x264.cmake)
+    include(cmake/xvidcore.cmake)
+    include(cmake/faad.cmake)
+    include(cmake/ffmpeg.cmake)
+    include(cmake/fftw.cmake)
+    include(cmake/sndfile.cmake)
+    if(WIN32)
+      include(cmake/iconv.cmake)
+    endif()
+    if(UNIX)
+      include(cmake/flac.cmake)
+      include(cmake/xml2.cmake)
+      if(NOT APPLE)
+        include(cmake/spnav.cmake)
+        include(cmake/jemalloc.cmake)
+      endif()
+    endif()
+  endif()
 endif()
 
 if(UNIX)
-	include(cmake/bzip2.cmake)
-	include(cmake/ffi.cmake)
-	include(cmake/lzma.cmake)
-	include(cmake/ssl.cmake)
-	include(cmake/sqlite.cmake)
+  include(cmake/bzip2.cmake)
+  include(cmake/ffi.cmake)
+  include(cmake/lzma.cmake)
+  include(cmake/ssl.cmake)
+  include(cmake/sqlite.cmake)
 endif()
 
 include(cmake/harvest.cmake)
diff --git a/build_files/build_environment/cmake/alembic.cmake b/build_files/build_environment/cmake/alembic.cmake
index e6323d53661..fa2d7243f7d 100644
--- a/build_files/build_environment/cmake/alembic.cmake
+++ b/build_files/build_environment/cmake/alembic.cmake
@@ -17,89 +17,89 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(ALEMBIC_HDF5)
-	set(ALEMBIC_HDF5_HL)
-	# in debug mode we do not build HDF5_hdf5_hl_LIBRARY which makes cmake really
-	# unhappy, stub it with the debug mode lib. it's not linking it in at this
-	# point in time anyhow
-	if(BUILD_MODE STREQUAL Debug)
-		set(ALEMBIC_HDF5_HL -DHDF5_hdf5_hl_LIBRARY=${LIBDIR}/hdf5/lib/libhdf5_hl_D.${LIBEXT})
-	endif()
+  set(ALEMBIC_HDF5_HL)
+  # in debug mode we do not build HDF5_hdf5_hl_LIBRARY which makes cmake really
+  # unhappy, stub it with the debug mode lib. it's not linking it in at this
+  # point in time anyhow
+  if(BUILD_MODE STREQUAL Debug)
+    set(ALEMBIC_HDF5_HL -DHDF5_hdf5_hl_LIBRARY=${LIBDIR}/hdf5/lib/libhdf5_hl_D.${LIBEXT})
+  endif()
 endif()
 
 if(WIN32)
-	set(ALEMBIC_ILMBASE ${LIBDIR}/openexr)
+  set(ALEMBIC_ILMBASE ${LIBDIR}/openexr)
 else()
-	set(ALEMBIC_ILMBASE ${LIBDIR}/ilmbase)
+  set(ALEMBIC_ILMBASE ${LIBDIR}/ilmbase)
 endif()
 
 set(ALEMBIC_EXTRA_ARGS
-	-DBUILDSTATIC=ON
-	-DLINKSTATIC=ON
-	-DALEMBIC_LIB_USES_BOOST=ON
-	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-	-DBoost_USE_MULTITHREADED=ON
-	-DUSE_STATIC_BOOST=On
-	-DBoost_USE_STATIC_LIBS=ON
-	-DBoost_USE_STATIC_RUNTIME=ON
-	-DBoost_DEBUG=ON
-	-DBOOST_ROOT=${LIBDIR}/boost
-	-DBoost_NO_SYSTEM_PATHS=ON
-	-DILMBASE_ROOT=${ALEMBIC_ILMBASE}
-	-DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${ALEMBIC_ILMBASE}/include/OpenEXR
-	-DALEMBIC_ILMBASE_HALF_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DALEMBIC_ILMBASE_IMATH_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DALEMBIC_ILMBASE_ILMTHREAD_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DALEMBIC_ILMBASE_IEX_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DALEMBIC_ILMBASE_IEXMATH_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}IexMath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DUSE_PYILMBASE=0
-	-DUSE_PYALEMBIC=0
-	-DUSE_ARNOLD=0
-	-DUSE_MAYA=0
-	-DUSE_PRMAN=0
-	-DUSE_HDF5=Off
-	-DUSE_STATIC_HDF5=Off
-	-DHDF5_ROOT=${LIBDIR}/hdf5
-	-DUSE_TESTS=Off
-	-DALEMBIC_NO_OPENGL=1
-	-DUSE_BINARIES=ON
-	-DALEMBIC_ILMBASE_LINK_STATIC=On
-	-DALEMBIC_SHARED_LIBS=OFF
-	-DGLUT_INCLUDE_DIR=""
-	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-	${ALEMBIC_HDF5_HL}
+  -DBUILDSTATIC=ON
+  -DLINKSTATIC=ON
+  -DALEMBIC_LIB_USES_BOOST=ON
+  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+  -DBoost_USE_MULTITHREADED=ON
+  -DUSE_STATIC_BOOST=On
+  -DBoost_USE_STATIC_LIBS=ON
+  -DBoost_USE_STATIC_RUNTIME=ON
+  -DBoost_DEBUG=ON
+  -DBOOST_ROOT=${LIBDIR}/boost
+  -DBoost_NO_SYSTEM_PATHS=ON
+  -DILMBASE_ROOT=${ALEMBIC_ILMBASE}
+  -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${ALEMBIC_ILMBASE}/include/OpenEXR
+  -DALEMBIC_ILMBASE_HALF_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_IMATH_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_IEX_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DALEMBIC_ILMBASE_IEXMATH_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}IexMath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DUSE_PYILMBASE=0
+  -DUSE_PYALEMBIC=0
+  -DUSE_ARNOLD=0
+  -DUSE_MAYA=0
+  -DUSE_PRMAN=0
+  -DUSE_HDF5=Off
+  -DUSE_STATIC_HDF5=Off
+  -DHDF5_ROOT=${LIBDIR}/hdf5
+  -DUSE_TESTS=Off
+  -DALEMBIC_NO_OPENGL=1
+  -DUSE_BINARIES=ON
+  -DALEMBIC_ILMBASE_LINK_STATIC=On
+  -DALEMBIC_SHARED_LIBS=OFF
+  -DGLUT_INCLUDE_DIR=""
+  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+  ${ALEMBIC_HDF5_HL}
 )
 
 ExternalProject_Add(external_alembic
-	URL ${ALEMBIC_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${ALEMBIC_MD5}
-	PREFIX ${BUILD_DIR}/alembic
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/alembic -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ALEMBIC_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/alembic
+  URL ${ALEMBIC_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${ALEMBIC_MD5}
+  PREFIX ${BUILD_DIR}/alembic
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/alembic -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ALEMBIC_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/alembic
 )
 
 if(WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_alembic after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_alembic after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/alembic/lib/alembic.lib ${HARVEST_TARGET}/alembic/lib/alembic_d.lib
-			DEPENDEES install
-		)
-	endif()
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_alembic after_install
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic
+      DEPENDEES install
+    )
+  endif()
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(external_alembic after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/alembic/lib/alembic.lib ${HARVEST_TARGET}/alembic/lib/alembic_d.lib
+      DEPENDEES install
+    )
+  endif()
 endif()
 
 
 
 add_dependencies(
-	external_alembic
-	external_boost
-	external_zlib
-	external_ilmbase
-	external_openexr
+  external_alembic
+  external_boost
+  external_zlib
+  external_ilmbase
+  external_openexr
 )
diff --git a/build_files/build_environment/cmake/blendthumb.cmake b/build_files/build_environment/cmake/blendthumb.cmake
index b3064016403..f4cc6ee9d37 100644
--- a/build_files/build_environment/cmake/blendthumb.cmake
+++ b/build_files/build_environment/cmake/blendthumb.cmake
@@ -17,51 +17,51 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(BUILD_MODE STREQUAL Release)
-	if(WIN32)
-		set(THUMB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../release/windows/blendthumb)
+  if(WIN32)
+    set(THUMB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../release/windows/blendthumb)
 
-		ExternalProject_Add(external_zlib_32
-			URL ${ZLIB_URI}
-			CMAKE_GENERATOR ${GENERATOR_32}
-			URL_HASH MD5=${ZLIB_HASH}
-			DOWNLOAD_DIR ${DOWNLOAD_DIR}
-			PREFIX ${BUILD_DIR}/zlib32
-			CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib32 ${DEFAULT_CMAKE_FLAGS}
-			INSTALL_DIR ${LIBDIR}/zlib32
-		)
+    ExternalProject_Add(external_zlib_32
+      URL ${ZLIB_URI}
+      CMAKE_GENERATOR ${GENERATOR_32}
+      URL_HASH MD5=${ZLIB_HASH}
+      DOWNLOAD_DIR ${DOWNLOAD_DIR}
+      PREFIX ${BUILD_DIR}/zlib32
+      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib32 ${DEFAULT_CMAKE_FLAGS}
+      INSTALL_DIR ${LIBDIR}/zlib32
+    )
 
-		ExternalProject_Add(external_zlib_64
-			URL ${ZLIB_URI}
-			CMAKE_GENERATOR ${GENERATOR_64}
-			URL_HASH MD5=${ZLIB_HASH}
-			DOWNLOAD_DIR ${DOWNLOAD_DIR}
-			PREFIX ${BUILD_DIR}/zlib64
-			CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib64 ${DEFAULT_CMAKE_FLAGS}
-			INSTALL_DIR ${LIBDIR}/zlib64
-		)
+    ExternalProject_Add(external_zlib_64
+      URL ${ZLIB_URI}
+      CMAKE_GENERATOR ${GENERATOR_64}
+      URL_HASH MD5=${ZLIB_HASH}
+      DOWNLOAD_DIR ${DOWNLOAD_DIR}
+      PREFIX ${BUILD_DIR}/zlib64
+      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib64 ${DEFAULT_CMAKE_FLAGS}
+      INSTALL_DIR ${LIBDIR}/zlib64
+    )
 
-		ExternalProject_Add(external_blendthumb_32
-			CMAKE_GENERATOR ${GENERATOR_32}
-			SOURCE_DIR ${THUMB_DIR}
-			PREFIX ${BUILD_DIR}/blendthumb32
-			CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blendThumb32 ${DEFAULT_CMAKE_FLAGS} -DZLIB_INCLUDE=${LIBDIR}/zlib32/include -DZLIB_LIBS=${LIBDIR}/zlib32/lib/zlibstatic.lib
-			INSTALL_DIR ${LIBDIR}/blendthumb32
-		)
-		add_dependencies(
-			external_blendthumb_32
-			external_zlib_32
-		)
+    ExternalProject_Add(external_blendthumb_32
+      CMAKE_GENERATOR ${GENERATOR_32}
+      SOURCE_DIR ${THUMB_DIR}
+      PREFIX ${BUILD_DIR}/blendthumb32
+      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blendThumb32 ${DEFAULT_CMAKE_FLAGS} -DZLIB_INCLUDE=${LIBDIR}/zlib32/include -DZLIB_LIBS=${LIBDIR}/zlib32/lib/zlibstatic.lib
+      INSTALL_DIR ${LIBDIR}/blendthumb32
+    )
+    add_dependencies(
+      external_blendthumb_32
+      external_zlib_32
+    )
 
-		ExternalProject_Add(external_blendthumb_64
-			CMAKE_GENERATOR ${GENERATOR_64}
-			SOURCE_DIR ${THUMB_DIR}
-			PREFIX ${BUILD_DIR}/blendthumb64
-			CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blendThumb64 ${DEFAULT_CMAKE_FLAGS} -DZLIB_INCLUDE=${LIBDIR}/zlib64/include -DZLIB_LIBS=${LIBDIR}/zlib64/lib/zlibstatic.lib
-			INSTALL_DIR ${LIBDIR}/blendthumb64
-		)
-		add_dependencies(
-			external_blendthumb_64
-			external_zlib_64
-		)
-	endif()
+    ExternalProject_Add(external_blendthumb_64
+      CMAKE_GENERATOR ${GENERATOR_64}
+      SOURCE_DIR ${THUMB_DIR}
+      PREFIX ${BUILD_DIR}/blendthumb64
+      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blendThumb64 ${DEFAULT_CMAKE_FLAGS} -DZLIB_INCLUDE=${LIBDIR}/zlib64/include -DZLIB_LIBS=${LIBDIR}/zlib64/lib/zlibstatic.lib
+      INSTALL_DIR ${LIBDIR}/blendthumb64
+    )
+    add_dependencies(
+      external_blendthumb_64
+      external_zlib_64
+    )
+  endif()
 endif()
diff --git a/build_files/build_environment/cmake/blosc.cmake b/build_files/build_environment/cmake/blosc.cmake
index 1cbf97063c0..c7f3cbb8dfa 100644
--- a/build_files/build_environment/cmake/blosc.cmake
+++ b/build_files/build_environment/cmake/blosc.cmake
@@ -17,59 +17,59 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(BLOSC_EXTRA_ARGS
-	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-	-DBUILD_TESTS=OFF
-	-DBUILD_BENCHMARKS=OFF
-	-DCMAKE_DEBUG_POSTFIX=_d
-	-DThreads_FOUND=1
-	-DPTHREAD_LIBS=${LIBDIR}/pthreads/lib/pthreadVC3.lib
-	-DPTHREAD_INCLUDE_DIR=${LIBDIR}/pthreads/inc
-	-DDEACTIVATE_SNAPPY=ON
-	-DCMAKE_POSITION_INDEPENDENT_CODE=ON
+  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+  -DBUILD_TESTS=OFF
+  -DBUILD_BENCHMARKS=OFF
+  -DCMAKE_DEBUG_POSTFIX=_d
+  -DThreads_FOUND=1
+  -DPTHREAD_LIBS=${LIBDIR}/pthreads/lib/pthreadVC3.lib
+  -DPTHREAD_INCLUDE_DIR=${LIBDIR}/pthreads/inc
+  -DDEACTIVATE_SNAPPY=ON
+  -DCMAKE_POSITION_INDEPENDENT_CODE=ON
 )
 
 if(WIN32)
-	#prevent blosc from including it's own local copy of zlib in the object file
-	#and cause linker errors with everybody else
-	set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS}
-		-DPREFER_EXTERNAL_ZLIB=ON
-	)
+  #prevent blosc from including it's own local copy of zlib in the object file
+  #and cause linker errors with everybody else
+  set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS}
+    -DPREFER_EXTERNAL_ZLIB=ON
+  )
 endif()
 
 ExternalProject_Add(external_blosc
-	URL ${BLOSC_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${BLOSC_HASH}
-	PREFIX ${BUILD_DIR}/blosc
-	PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/blosc/src/external_blosc < ${PATCH_DIR}/blosc.diff
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blosc ${DEFAULT_CMAKE_FLAGS} ${BLOSC_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/blosc
+  URL ${BLOSC_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${BLOSC_HASH}
+  PREFIX ${BUILD_DIR}/blosc
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/blosc/src/external_blosc < ${PATCH_DIR}/blosc.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blosc ${DEFAULT_CMAKE_FLAGS} ${BLOSC_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/blosc
 )
 
 add_dependencies(
-	external_blosc
-	external_zlib
+  external_blosc
+  external_zlib
 )
 if(WIN32)
-	add_dependencies(
-		external_blosc
-		external_pthreads
-	)
+  add_dependencies(
+    external_blosc
+    external_pthreads
+  )
 endif()
 
 if (WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_blosc after_install
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib
-			COMMAND	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_blosc after_install
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib
-			DEPENDEES install
-		)
-	endif()
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_blosc after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/
+      DEPENDEES install
+    )
+  endif()
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(external_blosc after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib
+      DEPENDEES install
+    )
+  endif()
 endif()
diff --git a/build_files/build_environment/cmake/boost.cmake b/build_files/build_environment/cmake/boost.cmake
index 33bfa1d4e82..7fcd7e754ae 100644
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -19,91 +19,91 @@
 set(BOOST_ADDRESS_MODEL 64)
 
 if(WIN32)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(PYTHON_ARCH x64)
-		set(PYTHON_ARCH2 win-AMD64)
-		set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/amd64/)
-	else()
-		set(PYTHON_ARCH x86)
-		set(PYTHON_ARCH2 win32)
-		set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/win32/)
-		set(BOOST_ADDRESS_MODEL 32)
-	endif()
-	if(MSVC14)
-		set(BOOST_TOOLSET toolset=msvc-14.0)
-		set(BOOST_COMPILER_STRING -vc140)
-	endif()
-	set(JAM_FILE ${BUILD_DIR}/boost/src/external_boost/user-config.jam)
-	set(semi_path "${PATCH_DIR}/semi.txt")
-	FILE(TO_NATIVE_PATH ${semi_path} semi_path)
-	set(BOOST_CONFIGURE_COMMAND bootstrap.bat &&
-								echo using python : ${PYTHON_OUTPUTDIR}\\python.exe > "${JAM_FILE}" &&
-								echo.   : ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/pc >> "${JAM_FILE}" &&
-								echo.   : ${BUILD_DIR}/python/src/external_python/pcbuild >> "${JAM_FILE}" &&
-								type ${semi_path} >> "${JAM_FILE}"
-	)
-	set(BOOST_BUILD_COMMAND bjam)
-	#--user-config=user-config.jam
-	set(BOOST_BUILD_OPTIONS runtime-link=static )
-	#set(BOOST_WITH_PYTHON --with-python)
-	set(BOOST_HARVEST_CMD 	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
-	if(BUILD_MODE STREQUAL Release)
-		set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_68/ ${HARVEST_TARGET}/boost/include/)
-	endif()
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(PYTHON_ARCH x64)
+    set(PYTHON_ARCH2 win-AMD64)
+    set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/amd64/)
+  else()
+    set(PYTHON_ARCH x86)
+    set(PYTHON_ARCH2 win32)
+    set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/win32/)
+    set(BOOST_ADDRESS_MODEL 32)
+  endif()
+  if(MSVC14)
+    set(BOOST_TOOLSET toolset=msvc-14.0)
+    set(BOOST_COMPILER_STRING -vc140)
+  endif()
+  set(JAM_FILE ${BUILD_DIR}/boost/src/external_boost/user-config.jam)
+  set(semi_path "${PATCH_DIR}/semi.txt")
+  FILE(TO_NATIVE_PATH ${semi_path} semi_path)
+  set(BOOST_CONFIGURE_COMMAND bootstrap.bat &&
+                echo using python : ${PYTHON_OUTPUTDIR}\\python.exe > "${JAM_FILE}" &&
+                echo.   : ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/pc >> "${JAM_FILE}" &&
+                echo.   : ${BUILD_DIR}/python/src/external_python/pcbuild >> "${JAM_FILE}" &&
+                type ${semi_path} >> "${JAM_FILE}"
+  )
+  set(BOOST_BUILD_COMMAND bjam)
+  #--user-config=user-config.jam
+  set(BOOST_BUILD_OPTIONS runtime-link=static )
+  #set(BOOST_WITH_PYTHON --with-python)
+  set(BOOST_HARVEST_CMD   ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
+  if(BUILD_MODE STREQUAL Release)
+    set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_68/ ${HARVEST_TARGET}/boost/include/)
+  endif()
 
 elseif(APPLE)
-	set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
-	set(BOOST_BUILD_COMMAND ./b2)
-	set(BOOST_BUILD_OPTIONS toolset=darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} --disable-icu boost.locale.icu=off)
-	set(BOOST_HARVEST_CMD echo .)
-	set(BOOST_PATCH_COMMAND echo .)
+  set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
+  set(BOOST_BUILD_COMMAND ./b2)
+  set(BOOST_BUILD_OPTIONS toolset=darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} --disable-icu boost.locale.icu=off)
+  set(BOOST_HARVEST_CMD echo .)
+  set(BOOST_PATCH_COMMAND echo .)
 else()
-	set(BOOST_HARVEST_CMD echo .)
-	set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
-	set(BOOST_BUILD_COMMAND ./b2)
-	set(BOOST_BUILD_OPTIONS cxxflags=${PLATFORM_CXXFLAGS} --disable-icu boost.locale.icu=off)
-	set(BOOST_PATCH_COMMAND echo .)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(BOOST_ADDRESS_MODEL 64)
-	else()
-		set(BOOST_ADDRESS_MODEL 32)
-	endif()
+  set(BOOST_HARVEST_CMD echo .)
+  set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
+  set(BOOST_BUILD_COMMAND ./b2)
+  set(BOOST_BUILD_OPTIONS cxxflags=${PLATFORM_CXXFLAGS} --disable-icu boost.locale.icu=off)
+  set(BOOST_PATCH_COMMAND echo .)
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(BOOST_ADDRESS_MODEL 64)
+  else()
+    set(BOOST_ADDRESS_MODEL 32)
+  endif()
 endif()
 
 set(BOOST_OPTIONS
-	--with-filesystem
-	--with-locale
-	--with-thread
-	--with-regex
-	--with-system
-	--with-date_time
-	--with-wave
-	--with-atomic
-	--with-serialization
-	--with-program_options
-	--with-iostreams
-	${BOOST_WITH_PYTHON}
-	${BOOST_TOOLSET}
+  --with-filesystem
+  --with-locale
+  --with-thread
+  --with-regex
+  --with-system
+  --with-date_time
+  --with-wave
+  --with-atomic
+  --with-serialization
+  --with-program_options
+  --with-iostreams
+  ${BOOST_WITH_PYTHON}
+  ${BOOST_TOOLSET}
 )
 
 string(TOLOWER ${BUILD_MODE} BOOST_BUILD_TYPE)
 
 ExternalProject_Add(external_boost
-	URL ${BOOST_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${BOOST_HASH}
-	PREFIX ${BUILD_DIR}/boost
-	UPDATE_COMMAND	""
-	PATCH_COMMAND ${BOOST_PATCH_COMMAND}
-	CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND}
-	BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=x86 address-model=${BOOST_ADDRESS_MODEL} link=static threading=multi ${BOOST_OPTIONS}	--prefix=${LIBDIR}/boost install
-	BUILD_IN_SOURCE 1
-	INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
+  URL ${BOOST_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${BOOST_HASH}
+  PREFIX ${BUILD_DIR}/boost
+  UPDATE_COMMAND  ""
+  PATCH_COMMAND ${BOOST_PATCH_COMMAND}
+  CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND}
+  BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=x86 address-model=${BOOST_ADDRESS_MODEL} link=static threading=multi ${BOOST_OPTIONS}    --prefix=${LIBDIR}/boost install
+  BUILD_IN_SOURCE 1
+  INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
 )
 
 if(WIN32)
-	add_dependencies(
-		external_boost
-		Make_Python_Environment
-	)
+  add_dependencies(
+    external_boost
+    Make_Python_Environment
+  )
 endif()
diff --git a/build_files/build_environment/cmake/bzip2.cmake b/build_files/build_environment/cmake/bzip2.cmake
index 6c515d10d61..fbf5551e719 100644
--- a/build_files/build_environment/cmake/bzip2.cmake
+++ b/build_files/build_environment/cmake/bzip2.cmake
@@ -21,19 +21,19 @@ set(BZIP2_CONFIGURE_ENV echo .)
 set(BZIP2_CONFIGURATION_ARGS)
 
 if(UNIX AND NOT APPLE)
-	set(BZIP2_LDFLAGS "-Wl,--as-needed")
-	set(BZIP2_CFLAGS "-fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64")
-	set(BZIP2_CONFIGURE_ENV ${BZIP2_CONFIGURE_ENV} && export LDFLAGS=${BZIP2_LDFLAGS} && export CFLAGS=${BZIP2_CFLAGS}
-		&& export PREFIX=${BZIP2_PREFIX})
+  set(BZIP2_LDFLAGS "-Wl,--as-needed")
+  set(BZIP2_CFLAGS "-fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64")
+  set(BZIP2_CONFIGURE_ENV ${BZIP2_CONFIGURE_ENV} && export LDFLAGS=${BZIP2_LDFLAGS} && export CFLAGS=${BZIP2_CFLAGS}
+    && export PREFIX=${BZIP2_PREFIX})
 endif()
 
 ExternalProject_Add(external_bzip2
-	URL ${BZIP2_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${BZIP2_HASH}
-	PREFIX ${BUILD_DIR}/bzip2
-	CONFIGURE_COMMAND echo .
-	BUILD_COMMAND ${BZIP2_CONFIGURE_ENV} && cd ${BUILD_DIR}/bzip2/src/external_bzip2/ && make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} -j${MAKE_THREADS}
-	INSTALL_COMMAND ${BZIP2_CONFIGURE_ENV} && cd ${BUILD_DIR}/bzip2/src/external_bzip2/ && make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} PREFIX=${BZIP2_PREFIX} install
-	INSTALL_DIR ${LIBDIR}/bzip2
+  URL ${BZIP2_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH SHA256=${BZIP2_HASH}
+  PREFIX ${BUILD_DIR}/bzip2
+  CONFIGURE_COMMAND echo .
+  BUILD_COMMAND ${BZIP2_CONFIGURE_ENV} && cd ${BUILD_DIR}/bzip2/src/external_bzip2/ && make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} -j${MAKE_THREADS}
+  INSTALL_COMMAND ${BZIP2_CONFIGURE_ENV} && cd ${BUILD_DIR}/bzip2/src/external_bzip2/ && make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} PREFIX=${BZIP2_PREFIX} install
+  INSTALL_DIR ${LIBDIR}/bzip2
 )
diff --git a/build_files/build_environment/cmake/clang.cmake b/build_files/build_environment/cmake/clang.cmake
index 699c38a293a..f1f537baf1d 100644
--- a/build_files/build_environment/cmake/clang.cmake
+++ b/build_files/build_environment/cmake/clang.cmake
@@ -17,47 +17,47 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(CLANG_EXTRA_ARGS
-	-DCLANG_PATH_TO_LLVM_SOURCE=${BUILD_DIR}/ll/src/ll
-	-DCLANG_PATH_TO_LLVM_BUILD=${LIBDIR}/llvm
-	-DLLVM_USE_CRT_RELEASE=MT
-	-DLLVM_USE_CRT_DEBUG=MTd
-	-DLLVM_CONFIG=${LIBDIR}/llvm/bin/llvm-config
+  -DCLANG_PATH_TO_LLVM_SOURCE=${BUILD_DIR}/ll/src/ll
+  -DCLANG_PATH_TO_LLVM_BUILD=${LIBDIR}/llvm
+  -DLLVM_USE_CRT_RELEASE=MT
+  -DLLVM_USE_CRT_DEBUG=MTd
+  -DLLVM_CONFIG=${LIBDIR}/llvm/bin/llvm-config
 )
 
 if(WIN32)
-	set(CLANG_GENERATOR "Ninja")
+  set(CLANG_GENERATOR "Ninja")
 else()
-	set(CLANG_GENERATOR "Unix Makefiles")
+  set(CLANG_GENERATOR "Unix Makefiles")
 endif()
 
 
 ExternalProject_Add(external_clang
-	URL ${CLANG_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${CLANG_HASH}
-	PREFIX ${BUILD_DIR}/clang
-	CMAKE_GENERATOR ${CLANG_GENERATOR}
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clang ${DEFAULT_CMAKE_FLAGS} ${CLANG_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/clang
+  URL ${CLANG_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${CLANG_HASH}
+  PREFIX ${BUILD_DIR}/clang
+  CMAKE_GENERATOR ${CLANG_GENERATOR}
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clang ${DEFAULT_CMAKE_FLAGS} ${CLANG_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/clang
 )
 
 if(MSVC)
-	if(BUILD_MODE STREQUAL Release)
-		set(CLANG_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/ ${HARVEST_TARGET}/llvm/)
-	else()
-		set(CLANG_HARVEST_COMMAND
-			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
-			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/bin/ ${HARVEST_TARGET}/llvm/debug/bin/ &&
-			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/include/ ${HARVEST_TARGET}/llvm/debug/include/
-		)
-	endif()
-	ExternalProject_Add_Step(external_clang after_install
-		COMMAND ${CLANG_HARVEST_COMMAND}
-		DEPENDEES mkdir update patch download configure build install
-	)
+  if(BUILD_MODE STREQUAL Release)
+    set(CLANG_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/ ${HARVEST_TARGET}/llvm/)
+  else()
+    set(CLANG_HARVEST_COMMAND
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/bin/ ${HARVEST_TARGET}/llvm/debug/bin/ &&
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/include/ ${HARVEST_TARGET}/llvm/debug/include/
+    )
+  endif()
+  ExternalProject_Add_Step(external_clang after_install
+    COMMAND ${CLANG_HARVEST_COMMAND}
+    DEPENDEES mkdir update patch download configure build install
+  )
 endif()
 
 add_dependencies(
-	external_clang
-	ll
+  external_clang
+  ll
 )
diff --git a/build_files/build_environment/cmake/clew.cmake b/build_files/build_environment/cmake/clew.cmake
index 0dcc1f24db7..ecc0f5ae4b6 100644
--- a/build_files/build_environment/cmake/clew.cmake
+++ b/build_files/build_environment/cmake/clew.cmake
@@ -19,10 +19,10 @@
 set(CLEW_EXTRA_ARGS)
 
 ExternalProject_Add(external_clew
-	URL ${CLEW_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${CLEW_HASH}
-	PREFIX ${BUILD_DIR}/clew
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CLEW_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/clew
+  URL ${CLEW_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${CLEW_HASH}
+  PREFIX ${BUILD_DIR}/clew
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CLEW_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/clew
 )
diff --git a/build_files/build_environment/cmake/cuew.cmake b/build_files/build_environment/cmake/cuew.cmake
index 99b7bb5c06d..bd0843b8940 100644
--- a/build_files/build_environment/cmake/cuew.cmake
+++ b/build_files/build_environment/cmake/cuew.cmake
@@ -19,11 +19,11 @@
 set(CUEW_EXTRA_ARGS)
 
 ExternalProject_Add(external_cuew
-	URL ${CUEW_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${CUEW_HASH}
-	PREFIX ${BUILD_DIR}/cuew
-	PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/cuew/src/external_cuew < ${PATCH_DIR}/cuew.diff
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/cuew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CUEW_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/cuew
+  URL ${CUEW_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${CUEW_HASH}
+  PREFIX ${BUILD_DIR}/cuew
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/cuew/src/external_cuew < ${PATCH_DIR}/cuew.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/cuew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CUEW_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/cuew
 )
diff --git a/build_files/build_environment/cmake/embree.cmake b/build_files/build_environment/cmake/embree.cmake
index 8c523e25f0c..2dd42614cc0 100644
--- a/build_files/build_environment/cmake/embree.cmake
+++ b/build_files/build_environment/cmake/embree.cmake
@@ -20,50 +20,50 @@
 # library itself does not depend on them, so should give no problems.
 
 set(EMBREE_EXTRA_ARGS
-	-DEMBREE_ISPC_SUPPORT=OFF
-	-DEMBREE_TUTORIALS=OFF
-	-DEMBREE_STATIC_LIB=ON
-	-DEMBREE_RAY_MASK=ON
-	-DEMBREE_FILTER_FUNCTION=ON
-	-DEMBREE_BACKFACE_CULLING=OFF
-	-DEMBREE_TASKING_SYSTEM=INTERNAL
-	-DEMBREE_MAX_ISA=AVX2
+  -DEMBREE_ISPC_SUPPORT=OFF
+  -DEMBREE_TUTORIALS=OFF
+  -DEMBREE_STATIC_LIB=ON
+  -DEMBREE_RAY_MASK=ON
+  -DEMBREE_FILTER_FUNCTION=ON
+  -DEMBREE_BACKFACE_CULLING=OFF
+  -DEMBREE_TASKING_SYSTEM=INTERNAL
+  -DEMBREE_MAX_ISA=AVX2
 )
 
 if(WIN32)
-	set(EMBREE_BUILD_DIR ${BUILD_MODE}/)
+  set(EMBREE_BUILD_DIR ${BUILD_MODE}/)
 else()
-	set(EMBREE_BUILD_DIR)
+  set(EMBREE_BUILD_DIR)
 endif()
 
 ExternalProject_Add(external_embree
-	URL ${EMBREE_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${EMBREE_HASH}
-	PREFIX ${BUILD_DIR}/embree
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/embree
+  URL ${EMBREE_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${EMBREE_HASH}
+  PREFIX ${BUILD_DIR}/embree
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/embree
 )
 if(WIN32)
 
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_embree after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree ${HARVEST_TARGET}/embree
-			DEPENDEES install
-		)
-	else()
-	ExternalProject_Add_Step(external_embree after_install
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree3.lib ${HARVEST_TARGET}/embree/lib/embree3_d.lib
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx.lib ${HARVEST_TARGET}/embree/lib/embree_avx_d.lib
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx2.lib ${HARVEST_TARGET}/embree/lib/embree_avx2_d.lib
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_sse42.lib ${HARVEST_TARGET}/embree/lib/embree_sse42_d.lib
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/lexers.lib ${HARVEST_TARGET}/embree/lib/lexers_d.lib
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/math.lib ${HARVEST_TARGET}/embree/lib/math_d.lib
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/simd.lib ${HARVEST_TARGET}/embree/lib/simd_d.lib
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/sys.lib ${HARVEST_TARGET}/embree/lib/sys_d.lib
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/tasking.lib ${HARVEST_TARGET}/embree/lib/tasking_d.lib
-			DEPENDEES install
-		)
-	endif()
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_embree after_install
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree ${HARVEST_TARGET}/embree
+      DEPENDEES install
+    )
+  else()
+  ExternalProject_Add_Step(external_embree after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree3.lib ${HARVEST_TARGET}/embree/lib/embree3_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx.lib ${HARVEST_TARGET}/embree/lib/embree_avx_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx2.lib ${HARVEST_TARGET}/embree/lib/embree_avx2_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_sse42.lib ${HARVEST_TARGET}/embree/lib/embree_sse42_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/lexers.lib ${HARVEST_TARGET}/embree/lib/lexers_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/math.lib ${HARVEST_TARGET}/embree/lib/math_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/simd.lib ${HARVEST_TARGET}/embree/lib/simd_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/sys.lib ${HARVEST_TARGET}/embree/lib/sys_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/tasking.lib ${HARVEST_TARGET}/embree/lib/tasking_d.lib
+      DEPENDEES install
+    )
+  endif()
 
 endif()
diff --git a/build_files/build_environment/cmake/faad.cmake b/build_files/build_environment/cmake/faad.cmake
index df940c423a3..0746fbdab71 100644
--- a/build_files/build_environment/cmake/faad.cmake
+++ b/build_files/build_environment/cmake/faad.cmake
@@ -19,22 +19,22 @@
 set(FAAD_EXTRA_ARGS)
 
 if (WIN32)
-	set(FAAD_EXTRA_CONFIGURE "utils\\win32\\ac2ver.exe" "faad2" "configure.ac" > libfaad\\win32_ver.h)
+  set(FAAD_EXTRA_CONFIGURE "utils\\win32\\ac2ver.exe" "faad2" "configure.ac" > libfaad\\win32_ver.h)
 else()
-	set(FAAD_EXTRA_CONFIGURE echo .)
+  set(FAAD_EXTRA_CONFIGURE echo .)
 endif()
 
 ExternalProject_Add(external_faad
-	URL ${FAAD_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${FAAD_HASH}
-	PREFIX ${BUILD_DIR}/faad
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && ${FAAD_EXTRA_CONFIGURE} && ${CONFIGURE_COMMAND} --disable-shared --enable-static --prefix=${LIBDIR}/faad
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make install
-	INSTALL_DIR ${LIBDIR}/faad
+  URL ${FAAD_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${FAAD_HASH}
+  PREFIX ${BUILD_DIR}/faad
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && ${FAAD_EXTRA_CONFIGURE} && ${CONFIGURE_COMMAND} --disable-shared --enable-static --prefix=${LIBDIR}/faad
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make install
+  INSTALL_DIR ${LIBDIR}/faad
 )
 
 if(MSVC)
-	set_target_properties(external_faad PROPERTIES FOLDER Mingw)
+  set_target_properties(external_faad PROPERTIES FOLDER Mingw)
 endif()
diff --git a/build_files/build_environment/cmake/ffi.cmake b/build_files/build_environment/cmake/ffi.cmake
index bc0932022cb..aec9f5bc3b3 100644
--- a/build_files/build_environment/cmake/ffi.cmake
+++ b/build_files/build_environment/cmake/ffi.cmake
@@ -17,24 +17,24 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_ffi
-	URL ${FFI_URI}
-	URL_HASH SHA256=${FFI_HASH}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	PREFIX ${BUILD_DIR}/ffi
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ffi
-		--enable-shared=no
-		--enable-static=yes
-		--with-pic
-		--libdir=${LIBDIR}/ffi/lib/
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && make install
-	PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/ffi/src/external_ffi < ${PATCH_DIR}/ffi.diff
-	INSTALL_DIR ${LIBDIR}/ffi
+  URL ${FFI_URI}
+  URL_HASH SHA256=${FFI_HASH}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  PREFIX ${BUILD_DIR}/ffi
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ffi
+    --enable-shared=no
+    --enable-static=yes
+    --with-pic
+    --libdir=${LIBDIR}/ffi/lib/
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && make install
+  PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/ffi/src/external_ffi < ${PATCH_DIR}/ffi.diff
+  INSTALL_DIR ${LIBDIR}/ffi
 )
 
 if (UNIX AND NOT APPLE)
-	ExternalProject_Add_Step(external_ffi after_install
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/ffi/lib/libffi.a ${LIBDIR}/ffi/lib/libffi_pic.a
-		DEPENDEES install
-	)
+  ExternalProject_Add_Step(external_ffi after_install
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/ffi/lib/libffi.a ${LIBDIR}/ffi/lib/libffi_pic.a
+    DEPENDEES install
+  )
 endif()
diff --git a/build_files/build_environment/cmake/ffmpeg.cmake b/build_files/build_environment/cmake/ffmpeg.cmake
index 2a8e3fd5d33..27d817e8948 100644
--- a/build_files/build_environment/cmake/ffmpeg.cmake
+++ b/build_files/build_environment/cmake/ffmpeg.cmake
@@ -22,131 +22,131 @@ set(FFMPEG_EXTRA_FLAGS --pkg-config-flags=--static --extra-cflags=${FFMPEG_CFLAG
 set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR})
 
 if(WIN32)
-	set(FFMPEG_ENV set ${FFMPEG_ENV} &&)
-	set(FFMPEG_EXTRA_FLAGS
-		${FFMPEG_EXTRA_FLAGS}
-		--disable-static
-		--enable-shared
-		--enable-w32threads
-		--disable-pthreads
-		--enable-libopenjpeg
-	)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-		set(FFMPEG_EXTRA_FLAGS
-			${FFMPEG_EXTRA_FLAGS}
-			--x86asmexe=yasm
-		)
-	endif()
+  set(FFMPEG_ENV set ${FFMPEG_ENV} &&)
+  set(FFMPEG_EXTRA_FLAGS
+    ${FFMPEG_EXTRA_FLAGS}
+    --disable-static
+    --enable-shared
+    --enable-w32threads
+    --disable-pthreads
+    --enable-libopenjpeg
+  )
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+    set(FFMPEG_EXTRA_FLAGS
+      ${FFMPEG_EXTRA_FLAGS}
+      --x86asmexe=yasm
+    )
+  endif()
 else()
-	set(FFMPEG_EXTRA_FLAGS
-		${FFMPEG_EXTRA_FLAGS}
-		--enable-static
-		--disable-shared
-		--enable-libopenjpeg
-	)
+  set(FFMPEG_EXTRA_FLAGS
+    ${FFMPEG_EXTRA_FLAGS}
+    --enable-static
+    --disable-shared
+    --enable-libopenjpeg
+  )
 endif()
 
 if(APPLE)
-	set(FFMPEG_EXTRA_FLAGS
-		${FFMPEG_EXTRA_FLAGS}
-		--target-os=darwin
-		)
+  set(FFMPEG_EXTRA_FLAGS
+    ${FFMPEG_EXTRA_FLAGS}
+    --target-os=darwin
+    )
 endif()
 
 ExternalProject_Add(external_ffmpeg
-	URL ${FFMPEG_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${FFMPEG_HASH}
-	# OpenJpeg is compiled with pthread support on Linux, which is all fine and is what we
-	# want for maximum runtime performance, but due to static nature of that library we
-	# need to force ffmpeg to link against pthread, otherwise test program used by autoconf
-	# will fail. This patch does that in a way that is compatible with multiple distributions.
-	PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
-	PREFIX ${BUILD_DIR}/ffmpeg
-	CONFIGURE_COMMAND ${CONFIGURE_ENV_NO_PERL} &&
-		cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ &&
-		${FFMPEG_ENV} ${CONFIGURE_COMMAND_NO_TARGET} ${FFMPEG_EXTRA_FLAGS}
-		--disable-lzma
-		--disable-avfilter
-		--disable-vdpau
-		--disable-bzlib
-		--disable-libgsm
-		--disable-libspeex
-		--enable-libvpx
-		--prefix=${LIBDIR}/ffmpeg
-		--enable-libtheora
-		--enable-libvorbis
-		--enable-zlib
-		--enable-stripping
-		--enable-runtime-cpudetect
-		--disable-vaapi
-		--disable-nonfree
-		--enable-gpl
-		--disable-postproc
-		--enable-libmp3lame
-		--disable-librtmp
-		--enable-libx264
-		--enable-libxvid
-		--disable-libopencore-amrnb
-		--disable-libopencore-amrwb
-		--disable-libdc1394
-		--disable-version3
-		--disable-debug
-		--enable-optimizations
-		--disable-sse
-		--disable-ssse3
-		--enable-ffplay
-		--disable-openssl
-		--disable-securetransport
-		--disable-indev=avfoundation
-		--disable-indev=qtkit
-		--disable-sdl2
-		--disable-gnutls
-		--disable-videotoolbox
-		--disable-libxcb
-		--disable-xlib
-		--disable-audiotoolbox
-		--disable-cuvid
-		--disable-nvenc
-		--disable-indev=jack
-		--disable-indev=alsa
-		--disable-outdev=alsa
-		--disable-crystalhd
-		--disable-sndio
-	BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg ${DEFAULT_CMAKE_FLAGS}
-	INSTALL_DIR ${LIBDIR}/ffmpeg
+  URL ${FFMPEG_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${FFMPEG_HASH}
+  # OpenJpeg is compiled with pthread support on Linux, which is all fine and is what we
+  # want for maximum runtime performance, but due to static nature of that library we
+  # need to force ffmpeg to link against pthread, otherwise test program used by autoconf
+  # will fail. This patch does that in a way that is compatible with multiple distributions.
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
+  PREFIX ${BUILD_DIR}/ffmpeg
+  CONFIGURE_COMMAND ${CONFIGURE_ENV_NO_PERL} &&
+    cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ &&
+    ${FFMPEG_ENV} ${CONFIGURE_COMMAND_NO_TARGET} ${FFMPEG_EXTRA_FLAGS}
+    --disable-lzma
+    --disable-avfilter
+    --disable-vdpau
+    --disable-bzlib
+    --disable-libgsm
+    --disable-libspeex
+    --enable-libvpx
+    --prefix=${LIBDIR}/ffmpeg
+    --enable-libtheora
+    --enable-libvorbis
+    --enable-zlib
+    --enable-stripping
+    --enable-runtime-cpudetect
+    --disable-vaapi
+    --disable-nonfree
+    --enable-gpl
+    --disable-postproc
+    --enable-libmp3lame
+    --disable-librtmp
+    --enable-libx264
+    --enable-libxvid
+    --disable-libopencore-amrnb
+    --disable-libopencore-amrwb
+    --disable-libdc1394
+    --disable-version3
+    --disable-debug
+    --enable-optimizations
+    --disable-sse
+    --disable-ssse3
+    --enable-ffplay
+    --disable-openssl
+    --disable-securetransport
+    --disable-indev=avfoundation
+    --disable-indev=qtkit
+    --disable-sdl2
+    --disable-gnutls
+    --disable-videotoolbox
+    --disable-libxcb
+    --disable-xlib
+    --disable-audiotoolbox
+    --disable-cuvid
+    --disable-nvenc
+    --disable-indev=jack
+    --disable-indev=alsa
+    --disable-outdev=alsa
+    --disable-crystalhd
+    --disable-sndio
+  BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg ${DEFAULT_CMAKE_FLAGS}
+  INSTALL_DIR ${LIBDIR}/ffmpeg
 )
 
 if(MSVC)
-	set_target_properties(external_ffmpeg PROPERTIES FOLDER Mingw)
+  set_target_properties(external_ffmpeg PROPERTIES FOLDER Mingw)
 endif()
 
 add_dependencies(
-	external_ffmpeg
-	external_zlib
-	external_faad
-	external_openjpeg
-	external_xvidcore
-	external_x264
-	external_vpx
-	external_theora
-	external_vorbis
-	external_ogg
-	external_lame
+  external_ffmpeg
+  external_zlib
+  external_faad
+  external_openjpeg
+  external_xvidcore
+  external_x264
+  external_vpx
+  external_theora
+  external_vorbis
+  external_ogg
+  external_lame
 )
 if(WIN32)
-	add_dependencies(
-		external_ffmpeg
-		external_zlib_mingw
-	)
+  add_dependencies(
+    external_ffmpeg
+    external_zlib_mingw
+  )
 endif()
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
-	ExternalProject_Add_Step(external_ffmpeg after_install
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/include ${HARVEST_TARGET}/ffmpeg/include
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/bin ${HARVEST_TARGET}/ffmpeg/lib
-		DEPENDEES install
-	)
+  ExternalProject_Add_Step(external_ffmpeg after_install
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/include ${HARVEST_TARGET}/ffmpeg/include
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/bin ${HARVEST_TARGET}/ffmpeg/lib
+    DEPENDEES install
+  )
 endif()
diff --git a/build_files/build_environment/cmake/fftw.cmake b/build_files/build_environment/cmake/fftw.cmake
index d85d7bc7538..2d10cf6ad28 100644
--- a/build_files/build_environment/cmake/fftw.cmake
+++ b/build_files/build_environment/cmake/fftw.cmake
@@ -19,29 +19,29 @@
 set(FFTW_EXTRA_ARGS)
 
 if(WIN32)
-	set(FFTW3_ENV set CFLAGS=-fno-stack-check -fno-stack-protector -mno-stack-arg-probe -fno-lto &&)
-	set(FFTW3_PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/fftw3/src/external_fftw3 < ${PATCH_DIR}/fftw3.diff)
+  set(FFTW3_ENV set CFLAGS=-fno-stack-check -fno-stack-protector -mno-stack-arg-probe -fno-lto &&)
+  set(FFTW3_PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/fftw3/src/external_fftw3 < ${PATCH_DIR}/fftw3.diff)
 endif()
 
 ExternalProject_Add(external_fftw3
-	URL ${FFTW_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${FFTW_HASH}
-	PREFIX ${BUILD_DIR}/fftw3
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${FFTW3_ENV} cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/fftw3
-	PATCH_COMMAND ${FFTW3_PATCH_COMMAND}
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make	-j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make install
-	INSTALL_DIR ${LIBDIR}/fftw3
+  URL ${FFTW_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${FFTW_HASH}
+  PREFIX ${BUILD_DIR}/fftw3
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${FFTW3_ENV} cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/fftw3
+  PATCH_COMMAND ${FFTW3_PATCH_COMMAND}
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make install
+  INSTALL_DIR ${LIBDIR}/fftw3
 )
 
 if(MSVC)
-	set_target_properties(external_fftw3 PROPERTIES FOLDER Mingw)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_fftw3 after_install
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/lib/libfftw3.a ${HARVEST_TARGET}/fftw3/lib/libfftw.lib
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/include/fftw3.h ${HARVEST_TARGET}/fftw3/include/fftw3.h
-			DEPENDEES install
-		)
-	endif()
+  set_target_properties(external_fftw3 PROPERTIES FOLDER Mingw)
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_fftw3 after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/lib/libfftw3.a ${HARVEST_TARGET}/fftw3/lib/libfftw.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/include/fftw3.h ${HARVEST_TARGET}/fftw3/include/fftw3.h
+      DEPENDEES install
+    )
+  endif()
 endif()
diff --git a/build_files/build_environment/cmake/flac.cmake b/build_files/build_environment/cmake/flac.cmake
index f5ef5809b40..2cc9a02fe3b 100644
--- a/build_files/build_environment/cmake/flac.cmake
+++ b/build_files/build_environment/cmake/flac.cmake
@@ -17,16 +17,16 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_flac
-	URL ${FLAC_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${FLAC_HASH}
-	PREFIX ${BUILD_DIR}/flac
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flac --disable-shared --enable-static
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && make install
-	INSTALL_DIR ${LIBDIR}/flac
+  URL ${FLAC_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH SHA256=${FLAC_HASH}
+  PREFIX ${BUILD_DIR}/flac
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flac --disable-shared --enable-static
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && make install
+  INSTALL_DIR ${LIBDIR}/flac
 )
 
 if(MSVC)
-	set_target_properties(external_flac PROPERTIES FOLDER Mingw)
+  set_target_properties(external_flac PROPERTIES FOLDER Mingw)
 endif()
diff --git a/build_files/build_environment/cmake/flexbison.cmake b/build_files/build_environment/cmake/flexbison.cmake
index f2908e1ce2c..d4363eb07e1 100644
--- a/build_files/build_environment/cmake/flexbison.cmake
+++ b/build_files/build_environment/cmake/flexbison.cmake
@@ -19,13 +19,13 @@
 set(FLEXBISON_EXTRA_ARGS)
 
 ExternalProject_Add(external_flexbison
-	URL ${FLEXBISON_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${FLEXBISON_HASH}
-	PREFIX ${BUILD_DIR}/flexbison
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/flexbison ${DEFAULT_CMAKE_FLAGS} ${FLEXBISON_EXTRA_ARGS}
-	CONFIGURE_COMMAND echo .
-	BUILD_COMMAND echo .
-	INSTALL_COMMAND COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/flexbison/src/external_flexbison/ ${LIBDIR}/flexbison/
-	INSTALL_DIR ${LIBDIR}/flexbison
+  URL ${FLEXBISON_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${FLEXBISON_HASH}
+  PREFIX ${BUILD_DIR}/flexbison
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/flexbison ${DEFAULT_CMAKE_FLAGS} ${FLEXBISON_EXTRA_ARGS}
+  CONFIGURE_COMMAND echo .
+  BUILD_COMMAND echo .
+  INSTALL_COMMAND COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/flexbison/src/external_flexbison/ ${LIBDIR}/flexbison/
+  INSTALL_DIR ${LIBDIR}/flexbison
 )
diff --git a/build_files/build_environment/cmake/freeglut.cmake b/build_files/build_environment/cmake/freeglut.cmake
index 043b382e8fd..39b09f92630 100644
--- a/build_files/build_environment/cmake/freeglut.cmake
+++ b/build_files/build_environment/cmake/freeglut.cmake
@@ -17,19 +17,19 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		set(FREEGLUT_EXTRA_ARGS
-			-DFREEGLUT_BUILD_SHARED_LIBS=Off
-			-DFREEGLUT_BUILD_STATIC_LIBS=On
-		)
+  if(BUILD_MODE STREQUAL Release)
+    set(FREEGLUT_EXTRA_ARGS
+      -DFREEGLUT_BUILD_SHARED_LIBS=Off
+      -DFREEGLUT_BUILD_STATIC_LIBS=On
+    )
 
-		ExternalProject_Add(external_freeglut
-			URL ${FREEGLUT_URI}
-			DOWNLOAD_DIR ${DOWNLOAD_DIR}
-			URL_HASH MD5=${FREEGLUT_HASH}
-			PREFIX ${BUILD_DIR}/freeglut
-			CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freeglut ${DEFAULT_C_FLAGS} ${DEFAULT_CXX_FLAGS} ${FREEGLUT_EXTRA_ARGS}
-			INSTALL_DIR ${LIBDIR}/freeglut
-		)
-	endif()
+    ExternalProject_Add(external_freeglut
+      URL ${FREEGLUT_URI}
+      DOWNLOAD_DIR ${DOWNLOAD_DIR}
+      URL_HASH MD5=${FREEGLUT_HASH}
+      PREFIX ${BUILD_DIR}/freeglut
+      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freeglut ${DEFAULT_C_FLAGS} ${DEFAULT_CXX_FLAGS} ${FREEGLUT_EXTRA_ARGS}
+      INSTALL_DIR ${LIBDIR}/freeglut
+    )
+  endif()
 endif()
diff --git a/build_files/build_environment/cmake/freetype.cmake b/build_files/build_environment/cmake/freetype.cmake
index 1034e9f2029..f998c94706f 100644
--- a/build_files/build_environment/cmake/freetype.cmake
+++ b/build_files/build_environment/cmake/freetype.cmake
@@ -17,28 +17,28 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(FREETYPE_EXTRA_ARGS
-	-DCMAKE_RELEASE_POSTFIX:STRING=2ST
-	-DCMAKE_DEBUG_POSTFIX:STRING=2ST_d
-	-DWITH_BZip2=OFF
-	-DWITH_HarfBuzz=OFF
-	-DFT_WITH_HARFBUZZ=OFF
-	-DFT_WITH_BZIP2=OFF
-	-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
-	-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE)
+  -DCMAKE_RELEASE_POSTFIX:STRING=2ST
+  -DCMAKE_DEBUG_POSTFIX:STRING=2ST_d
+  -DWITH_BZip2=OFF
+  -DWITH_HarfBuzz=OFF
+  -DFT_WITH_HARFBUZZ=OFF
+  -DFT_WITH_BZIP2=OFF
+  -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
+  -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE)
 
 ExternalProject_Add(external_freetype
-	URL ${FREETYPE_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${FREETYPE_HASH}
-	PREFIX ${BUILD_DIR}/freetype
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freetype ${DEFAULT_CMAKE_FLAGS} ${FREETYPE_EXTRA_ARGS}
-	PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/freetype/src/external_freetype < ${PATCH_DIR}/freetype.diff
-	INSTALL_DIR ${LIBDIR}/freetype
+  URL ${FREETYPE_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${FREETYPE_HASH}
+  PREFIX ${BUILD_DIR}/freetype
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freetype ${DEFAULT_CMAKE_FLAGS} ${FREETYPE_EXTRA_ARGS}
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/freetype/src/external_freetype < ${PATCH_DIR}/freetype.diff
+  INSTALL_DIR ${LIBDIR}/freetype
 )
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
-	ExternalProject_Add_Step(external_freetype after_install
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype
-		DEPENDEES install
-	)
+  ExternalProject_Add_Step(external_freetype after_install
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype
+    DEPENDEES install
+  )
 endif()
diff --git a/build_files/build_environment/cmake/glew.cmake b/build_files/build_environment/cmake/glew.cmake
index b5d9e4d3310..2f8b88e8ddf 100644
--- a/build_files/build_environment/cmake/glew.cmake
+++ b/build_files/build_environment/cmake/glew.cmake
@@ -17,16 +17,16 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(GLEW_EXTRA_ARGS
-	-DBUILD_UTILS=Off
-	-DBUILD_SHARED_LIBS=Off
+  -DBUILD_UTILS=Off
+  -DBUILD_SHARED_LIBS=Off
 )
 
 ExternalProject_Add(external_glew
-	URL ${GLEW_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${GLEW_HASH}
-	PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_glew.txt	${BUILD_DIR}/glew/src/external_glew/CMakeLists.txt
-	PREFIX ${BUILD_DIR}/glew
-	CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glew ${DEFAULT_CMAKE_FLAGS} ${GLEW_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/glew
+  URL ${GLEW_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${GLEW_HASH}
+  PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_glew.txt ${BUILD_DIR}/glew/src/external_glew/CMakeLists.txt
+  PREFIX ${BUILD_DIR}/glew
+  CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glew ${DEFAULT_CMAKE_FLAGS} ${GLEW_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/glew
 )
diff --git a/build_files/build_environment/cmake/glfw.cmake b/build_files/build_environment/cmake/glfw.cmake
index ae80080525c..3a61c195ad6 100644
--- a/build_files/build_environment/cmake/glfw.cmake
+++ b/build_files/build_environment/cmake/glfw.cmake
@@ -19,10 +19,10 @@
 set(GLFW_EXTRA_ARGS)
 
 ExternalProject_Add(external_glfw
-	URL ${GLFW_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${GLFW_HASH}
-	PREFIX ${BUILD_DIR}/glfw
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glfw -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${GLFW_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/glfw
+  URL ${GLFW_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${GLFW_HASH}
+  PREFIX ${BUILD_DIR}/glfw
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glfw -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${GLFW_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/glfw
 )
diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake
index 0e98780e3f0..27bcd184c44 100644
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -21,90 +21,90 @@
 ########################################################################
 
 if(NOT DEFINED HARVEST_TARGET)
-	set(HARVEST_TARGET ${CMAKE_CURRENT_SOURCE_DIR}/Harvest)
+  set(HARVEST_TARGET ${CMAKE_CURRENT_SOURCE_DIR}/Harvest)
 endif()
 message("HARVEST_TARGET = ${HARVEST_TARGET}")
 
 if(WIN32)
 if(BUILD_MODE STREQUAL Release)
-	add_custom_target(Harvest_Release_Results
-		COMMAND # jpeg rename libfile + copy include
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
-				# OpenImageIO
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include &&
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib &&
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe &&
-				# png
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
-				# freeglut-> opengl
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
-				# glew-> opengl
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib &&
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ &&
-				# sndfile
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/lib/libsndfile.dll.a ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.lib &&
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/bin/libsndfile-1.dll ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.dll &&
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/include/sndfile.h ${HARVEST_TARGET}/sndfile/include/sndfile.h &&
-				# tiff
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/ &&
-				# BlendThumb
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb64/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb64.dll &&
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb32/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb.dll &&
-				# hidapi
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/ ${HARVEST_TARGET}/hidapi/ &&
-				# webp, straight up copy
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/webp ${HARVEST_TARGET}/webp &&
-		DEPENDS
-	)
+  add_custom_target(Harvest_Release_Results
+    COMMAND # jpeg rename libfile + copy include
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
+        # OpenImageIO
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include &&
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib &&
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe &&
+        # png
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
+        # freeglut-> opengl
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
+        # glew-> opengl
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib &&
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ &&
+        # sndfile
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/lib/libsndfile.dll.a ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.lib &&
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/bin/libsndfile-1.dll ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.dll &&
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/include/sndfile.h ${HARVEST_TARGET}/sndfile/include/sndfile.h &&
+        # tiff
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/ &&
+        # BlendThumb
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb64/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb64.dll &&
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb32/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb.dll &&
+        # hidapi
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/ ${HARVEST_TARGET}/hidapi/ &&
+        # webp, straight up copy
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/webp ${HARVEST_TARGET}/webp &&
+    DEPENDS
+  )
 endif()
 
 if(BUILD_MODE STREQUAL Debug)
-	add_custom_target(Harvest_Debug_Results
-				# OpenImageIO
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib &&
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib &&
-				# python
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ &&
-				# hdf5
-				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib &&
-				# numpy
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}d.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}d.tar.gz &&
-				# python
-				${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz
-		DEPENDS Package_Python
-	)
+  add_custom_target(Harvest_Debug_Results
+        # OpenImageIO
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib &&
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib &&
+        # python
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ &&
+        # hdf5
+        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib &&
+        # numpy
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}d.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}d.tar.gz &&
+        # python
+        ${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz
+    DEPENDS Package_Python
+  )
 endif()
 
 else(WIN32)
 
 function(harvest from to)
-	set(pattern "")
-	foreach(f ${ARGN})
-		set(pattern ${f})
-	endforeach()
+  set(pattern "")
+  foreach(f ${ARGN})
+    set(pattern ${f})
+  endforeach()
 
-	if(pattern STREQUAL "")
-		get_filename_component(dirpath ${to} DIRECTORY)
-		get_filename_component(filename ${to} NAME)
-		install(
-			FILES ${LIBDIR}/${from}
-			DESTINATION ${HARVEST_TARGET}/${dirpath}
-			RENAME ${filename})
-	else()
-		install(
-			DIRECTORY ${LIBDIR}/${from}/
-			DESTINATION ${HARVEST_TARGET}/${to}
-			USE_SOURCE_PERMISSIONS
-			FILES_MATCHING PATTERN ${pattern}
-			PATTERN "pkgconfig" EXCLUDE
-			PATTERN "cmake" EXCLUDE
-			PATTERN "__pycache__" EXCLUDE
-			PATTERN "tests" EXCLUDE)
-	endif()
+  if(pattern STREQUAL "")
+    get_filename_component(dirpath ${to} DIRECTORY)
+    get_filename_component(filename ${to} NAME)
+    install(
+      FILES ${LIBDIR}/${from}
+      DESTINATION ${HARVEST_TARGET}/${dirpath}
+      RENAME ${filename})
+  else()
+    install(
+      DIRECTORY ${LIBDIR}/${from}/
+      DESTINATION ${HARVEST_TARGET}/${to}
+      USE_SOURCE_PERMISSIONS
+      FILES_MATCHING PATTERN ${pattern}
+      PATTERN "pkgconfig" EXCLUDE
+      PATTERN "cmake" EXCLUDE
+      PATTERN "__pycache__" EXCLUDE
+      PATTERN "tests" EXCLUDE)
+  endif()
 endfunction()
 
 harvest(alembic/include alembic/include "*.h")
@@ -134,25 +134,25 @@ harvest(llvm/include llvm/include "*")
 harvest(llvm/bin llvm/bin "llvm-config")
 harvest(llvm/lib llvm/lib "libLLVM*.a")
 if(APPLE)
-	harvest(openmp/lib openmp/lib "*")
-	harvest(openmp/include openmp/include "*.h")
+  harvest(openmp/lib openmp/lib "*")
+  harvest(openmp/include openmp/include "*.h")
 endif()
 harvest(ogg/lib ffmpeg/lib "*.a")
 harvest(openal/include openal/include "*.h")
 if(UNIX AND NOT APPLE)
-	harvest(openal/lib openal/lib "*.a")
+  harvest(openal/lib openal/lib "*.a")
 
-	harvest(blosc/include blosc/include "*.h")
-	harvest(blosc/lib blosc/lib "*.a")
+  harvest(blosc/include blosc/include "*.h")
+  harvest(blosc/lib blosc/lib "*.a")
 
-	harvest(zlib/include zlib/include "*.h")
-	harvest(zlib/lib zlib/lib "*.a")
+  harvest(zlib/include zlib/include "*.h")
+  harvest(zlib/lib zlib/lib "*.a")
 
-	harvest(xml2/include xml2/include "*.h")
-	harvest(xml2/lib xml2/lib "*.a")
+  harvest(xml2/include xml2/include "*.h")
+  harvest(xml2/lib xml2/lib "*.a")
 else()
-	harvest(blosc/lib openvdb/lib "*.a")
-	harvest(xml2/lib opencollada/lib "*.a")
+  harvest(blosc/lib openvdb/lib "*.a")
+  harvest(xml2/lib opencollada/lib "*.a")
 endif()
 harvest(opencollada/include/opencollada opencollada/include "*.h")
 harvest(opencollada/lib/opencollada opencollada/lib "*.a")
diff --git a/build_files/build_environment/cmake/hdf5.cmake b/build_files/build_environment/cmake/hdf5.cmake
index 63ad14761da..e28903059f2 100644
--- a/build_files/build_environment/cmake/hdf5.cmake
+++ b/build_files/build_environment/cmake/hdf5.cmake
@@ -17,26 +17,26 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(HDF5_EXTRA_ARGS
-	-DHDF5_ENABLE_THREADSAFE=Off
-	-DHDF5_BUILD_CPP_LIB=Off
-	-DBUILD_TESTING=Off
-	-DHDF5_BUILD_TOOLS=Off
-	-DHDF5_BUILD_EXAMPLES=Off
-	-DHDF5_BUILD_HL_LIB=On
-	-DBUILD_STATIC_CRT_LIBS=On
-	-DBUILD_SHARED_LIBS=On
+  -DHDF5_ENABLE_THREADSAFE=Off
+  -DHDF5_BUILD_CPP_LIB=Off
+  -DBUILD_TESTING=Off
+  -DHDF5_BUILD_TOOLS=Off
+  -DHDF5_BUILD_EXAMPLES=Off
+  -DHDF5_BUILD_HL_LIB=On
+  -DBUILD_STATIC_CRT_LIBS=On
+  -DBUILD_SHARED_LIBS=On
 )
 
 if(WIN32)
-	set(HDF5_PATCH ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/hdf5/src/external_hdf5 < ${PATCH_DIR}/hdf5.diff)
+  set(HDF5_PATCH ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/hdf5/src/external_hdf5 < ${PATCH_DIR}/hdf5.diff)
 endif()
 
 ExternalProject_Add(external_hdf5
-	URL ${HDF5_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${HDF5_HASH}
-	PREFIX ${BUILD_DIR}/hdf5
-	PATCH_COMMAND ${HDF5_PATCH}
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hdf5 ${HDF5_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/hdf5
+  URL ${HDF5_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${HDF5_HASH}
+  PREFIX ${BUILD_DIR}/hdf5
+  PATCH_COMMAND ${HDF5_PATCH}
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hdf5 ${HDF5_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/hdf5
 )
diff --git a/build_files/build_environment/cmake/hidapi.cmake b/build_files/build_environment/cmake/hidapi.cmake
index cfa4cc53d2d..9a3d2ebf8df 100644
--- a/build_files/build_environment/cmake/hidapi.cmake
+++ b/build_files/build_environment/cmake/hidapi.cmake
@@ -19,11 +19,11 @@
 set(HIDAPI_EXTRA_ARGS)
 
 ExternalProject_Add(external_hidapi
-	URL ${HIDAPI_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${HIDAPI_HASH}
-	PREFIX ${BUILD_DIR}/hidapi
-	PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_hidapi.txt	${BUILD_DIR}/hidapi/src/external_hidapi/cmakelists.txt && ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/hidapi/src/external_hidapi < ${PATCH_DIR}/hidapi.diff
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hidapi -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${HIDAPI_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/hidapi
+  URL ${HIDAPI_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${HIDAPI_HASH}
+  PREFIX ${BUILD_DIR}/hidapi
+  PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_hidapi.txt   ${BUILD_DIR}/hidapi/src/external_hidapi/cmakelists.txt && ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/hidapi/src/external_hidapi < ${PATCH_DIR}/hidapi.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hidapi -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${HIDAPI_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/hidapi
 )
diff --git a/build_files/build_environment/cmake/iconv.cmake b/build_files/build_environment/cmake/iconv.cmake
index 18f8f60b4f5..5be677392e6 100644
--- a/build_files/build_environment/cmake/iconv.cmake
+++ b/build_files/build_environment/cmake/iconv.cmake
@@ -19,23 +19,23 @@
 set(ICONV_EXTRA_ARGS)
 
 ExternalProject_Add(external_iconv
-	URL ${ICONV_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${ICONV_HASH}
-	PREFIX ${BUILD_DIR}/iconv
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/iconv
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make install
-	INSTALL_DIR ${LIBDIR}/iconv
+  URL ${ICONV_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${ICONV_HASH}
+  PREFIX ${BUILD_DIR}/iconv
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/iconv
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make install
+  INSTALL_DIR ${LIBDIR}/iconv
 )
 
 if(MSVC)
-	set_target_properties(external_iconv PROPERTIES FOLDER Mingw)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_iconv after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/lib/libiconv.a ${HARVEST_TARGET}/iconv/lib/iconv.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/include/iconv.h ${HARVEST_TARGET}/iconv/include/iconv.h
-			DEPENDEES install
-		)
-	endif()
+  set_target_properties(external_iconv PROPERTIES FOLDER Mingw)
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_iconv after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/lib/libiconv.a ${HARVEST_TARGET}/iconv/lib/iconv.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/include/iconv.h ${HARVEST_TARGET}/iconv/include/iconv.h
+      DEPENDEES install
+    )
+  endif()
 endif()
diff --git a/build_files/build_environment/cmake/ilmbase.cmake b/build_files/build_environment/cmake/ilmbase.cmake
index 22be39c3ff1..97761b4ad49 100644
--- a/build_files/build_environment/cmake/ilmbase.cmake
+++ b/build_files/build_environment/cmake/ilmbase.cmake
@@ -17,42 +17,42 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-	set(ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
-	set(ILMBASE_EXTRA_ARGS
-		-DBUILD_SHARED_LIBS=OFF
-		-DCMAKE_CXX_STANDARD_LIBRARIES=${ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES}
-	)
+  set(ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
+  set(ILMBASE_EXTRA_ARGS
+    -DBUILD_SHARED_LIBS=OFF
+    -DCMAKE_CXX_STANDARD_LIBRARIES=${ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES}
+  )
 
-	ExternalProject_Add(external_ilmbase
-		URL ${ILMBASE_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH MD5=${ILMBASE_HASH}
-		PREFIX ${BUILD_DIR}/ilmbase
-		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ilmbase ${DEFAULT_CMAKE_FLAGS} ${ILMBASE_EXTRA_ARGS}
-		INSTALL_DIR ${LIBDIR}/openexr
-	)
+  ExternalProject_Add(external_ilmbase
+    URL ${ILMBASE_URI}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH MD5=${ILMBASE_HASH}
+    PREFIX ${BUILD_DIR}/ilmbase
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ilmbase ${DEFAULT_CMAKE_FLAGS} ${ILMBASE_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/openexr
+  )
 
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_ilmbase after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ilmbase ${HARVEST_TARGET}/openexr
-			DEPENDEES install
-		)
-	endif()
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_ilmbase after_install
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ilmbase ${HARVEST_TARGET}/openexr
+      DEPENDEES install
+    )
+  endif()
 
 else()
-	set(ILMBASE_EXTRA_ARGS
-		--enable-static
-		--disable-shared
-		--enable-cxxstd=11
-	)
-	ExternalProject_Add(external_ilmbase
-		URL ${ILMBASE_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH MD5=${ILMBASE_HASH}
-		PREFIX ${BUILD_DIR}/ilmbase
-		CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ilmbase ${ILMBASE_EXTRA_ARGS}
-		BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && make -j${MAKE_THREADS}
-		INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && make install
-		INSTALL_DIR ${LIBDIR}/openexr
-	)
+  set(ILMBASE_EXTRA_ARGS
+    --enable-static
+    --disable-shared
+    --enable-cxxstd=11
+  )
+  ExternalProject_Add(external_ilmbase
+    URL ${ILMBASE_URI}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH MD5=${ILMBASE_HASH}
+    PREFIX ${BUILD_DIR}/ilmbase
+    CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ilmbase ${ILMBASE_EXTRA_ARGS}
+    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && make -j${MAKE_THREADS}
+    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && make install
+    INSTALL_DIR ${LIBDIR}/openexr
+  )
 endif()
diff --git a/build_files/build_environment/cmake/jemalloc.cmake b/build_files/build_environment/cmake/jemalloc.cmake
index c39ba448917..30f584ac2ee 100644
--- a/build_files/build_environment/cmake/jemalloc.cmake
+++ b/build_files/build_environment/cmake/jemalloc.cmake
@@ -17,12 +17,12 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_jemalloc
-	URL ${JEMALLOC_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${JEMALLOC_HASH}
-	PREFIX ${BUILD_DIR}/jemalloc
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jemalloc --disable-shared --enable-static --with-pic
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && make install
-	INSTALL_DIR ${LIBDIR}/jemalloc
+  URL ${JEMALLOC_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${JEMALLOC_HASH}
+  PREFIX ${BUILD_DIR}/jemalloc
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jemalloc --disable-shared --enable-static --with-pic
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && make install
+  INSTALL_DIR ${LIBDIR}/jemalloc
 )
diff --git a/build_files/build_environment/cmake/jpeg.cmake b/build_files/build_environment/cmake/jpeg.cmake
index 9975bb9c4f6..47f526e3d29 100644
--- a/build_files/build_environment/cmake/jpeg.cmake
+++ b/build_files/build_environment/cmake/jpeg.cmake
@@ -17,49 +17,49 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-	# cmake for windows
-	set(JPEG_EXTRA_ARGS -DNASM=${NASM_PATH} -DWITH_JPEG8=ON  -DCMAKE_DEBUG_POSTFIX=d)
+  # cmake for windows
+  set(JPEG_EXTRA_ARGS -DNASM=${NASM_PATH} -DWITH_JPEG8=ON  -DCMAKE_DEBUG_POSTFIX=d)
 
-	ExternalProject_Add(external_jpeg
-		URL ${JPEG_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH MD5=${JPEG_HASH}
-		PREFIX ${BUILD_DIR}/jpg
-		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
-		INSTALL_DIR ${LIBDIR}/jpg
-	)
+  ExternalProject_Add(external_jpeg
+    URL ${JPEG_URI}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH MD5=${JPEG_HASH}
+    PREFIX ${BUILD_DIR}/jpg
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/jpg
+  )
 
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_jpeg after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpegd${LIBEXT}  ${LIBDIR}/jpg/lib/jpeg${LIBEXT}
-			DEPENDEES install
-		)
-	endif()
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(external_jpeg after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpegd${LIBEXT}  ${LIBDIR}/jpg/lib/jpeg${LIBEXT}
+      DEPENDEES install
+    )
+  endif()
 
-	if(BUILD_MODE STREQUAL Release)
-		set(JPEG_LIBRARY jpeg-static${LIBEXT})
-	else()
-		set(JPEG_LIBRARY jpeg-staticd${LIBEXT})
-	endif()
+  if(BUILD_MODE STREQUAL Release)
+    set(JPEG_LIBRARY jpeg-static${LIBEXT})
+  else()
+    set(JPEG_LIBRARY jpeg-staticd${LIBEXT})
+  endif()
 else(WIN32)
-	# autoconf for unix
-	if(APPLE)
-		set(JPEG_EXTRA_ARGS --host x86_64-apple-darwin --with-jpeg8)
-	else()
-		set(JPEG_EXTRA_ARGS --with-jpeg8)
-	endif()
+  # autoconf for unix
+  if(APPLE)
+    set(JPEG_EXTRA_ARGS --host x86_64-apple-darwin --with-jpeg8)
+  else()
+    set(JPEG_EXTRA_ARGS --with-jpeg8)
+  endif()
 
-	ExternalProject_Add(external_jpeg
-		URL ${JPEG_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH MD5=${JPEG_HASH}
-		CONFIGURE_COMMAND ${CONFIGURE_ENV} && autoreconf -fiv && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jpg NASM=yasm ${JPEG_EXTRA_ARGS}
-		BUILD_IN_SOURCE 1
-		BUILD_COMMAND ${CONFIGURE_ENV} && make install
-		PREFIX ${BUILD_DIR}/jpg
-		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
-		INSTALL_DIR ${LIBDIR}/jpg
-	)
+  ExternalProject_Add(external_jpeg
+    URL ${JPEG_URI}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH MD5=${JPEG_HASH}
+    CONFIGURE_COMMAND ${CONFIGURE_ENV} && autoreconf -fiv && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jpg NASM=yasm ${JPEG_EXTRA_ARGS}
+    BUILD_IN_SOURCE 1
+    BUILD_COMMAND ${CONFIGURE_ENV} && make install
+    PREFIX ${BUILD_DIR}/jpg
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/jpg
+  )
 
-	set(JPEG_LIBRARY libjpeg${LIBEXT})
+  set(JPEG_LIBRARY libjpeg${LIBEXT})
 endif(WIN32)
diff --git a/build_files/build_environment/cmake/lame.cmake b/build_files/build_environment/cmake/lame.cmake
index b7b9275bf5e..d60784e8a40 100644
--- a/build_files/build_environment/cmake/lame.cmake
+++ b/build_files/build_environment/cmake/lame.cmake
@@ -18,30 +18,30 @@
 
 set(LAME_EXTRA_ARGS)
 if(MSVC)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-	set(LAME_EXTRA_ARGS CFLAGS=-msse)
-	endif()
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+  set(LAME_EXTRA_ARGS CFLAGS=-msse)
+  endif()
 endif()
 
 ExternalProject_Add(external_lame
-	URL ${LAME_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${LAME_HASH}
-	PREFIX ${BUILD_DIR}/lame
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lame --disable-shared --enable-static ${LAME_EXTRA_ARGS}
-		--enable-export=full
-		--with-fileio=sndfile
-		--without-vorbis
-		--with-pic
-		--disable-mp3x
-		--disable-mp3rtp
-		--disable-gtktest
-		--disable-frontend
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make install
-	INSTALL_DIR ${LIBDIR}/lame
+  URL ${LAME_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${LAME_HASH}
+  PREFIX ${BUILD_DIR}/lame
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lame --disable-shared --enable-static ${LAME_EXTRA_ARGS}
+    --enable-export=full
+    --with-fileio=sndfile
+    --without-vorbis
+    --with-pic
+    --disable-mp3x
+    --disable-mp3rtp
+    --disable-gtktest
+    --disable-frontend
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make install
+  INSTALL_DIR ${LIBDIR}/lame
 )
 
 if(MSVC)
-	set_target_properties(external_lame PROPERTIES FOLDER Mingw)
+  set_target_properties(external_lame PROPERTIES FOLDER Mingw)
 endif()
diff --git a/build_files/build_environment/cmake/lcms.cmake b/build_files/build_environment/cmake/lcms.cmake
index 852d2b8d04c..7e8f955aa58 100644
--- a/build_files/build_environment/cmake/lcms.cmake
+++ b/build_files/build_environment/cmake/lcms.cmake
@@ -20,12 +20,12 @@ set(LCMS_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_lcms
-	URL ${LCMS_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${LCMS_HASH}
-	PREFIX ${BUILD_DIR}/lcms
-	#patch taken from ocio
-	PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_lcms.txt ${BUILD_DIR}/lcms/src/external_lcms/CMakeLists.txt
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/lcms ${DEFAULT_CMAKE_FLAGS} ${LCMS_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/lcms
+  URL ${LCMS_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${LCMS_HASH}
+  PREFIX ${BUILD_DIR}/lcms
+  #patch taken from ocio
+  PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_lcms.txt ${BUILD_DIR}/lcms/src/external_lcms/CMakeLists.txt
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/lcms ${DEFAULT_CMAKE_FLAGS} ${LCMS_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/lcms
 )
diff --git a/build_files/build_environment/cmake/llvm.cmake b/build_files/build_environment/cmake/llvm.cmake
index e3386b941ee..8acf6b56e3d 100644
--- a/build_files/build_environment/cmake/llvm.cmake
+++ b/build_files/build_environment/cmake/llvm.cmake
@@ -17,42 +17,42 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(LLVM_EXTRA_ARGS
-	-DLLVM_USE_CRT_RELEASE=MT
-	-DLLVM_USE_CRT_DEBUG=MTd
-	-DLLVM_INCLUDE_TESTS=OFF
-	-DLLVM_TARGETS_TO_BUILD=X86
-	-DLLVM_INCLUDE_EXAMPLES=OFF
-	-DLLVM_ENABLE_TERMINFO=OFF
+  -DLLVM_USE_CRT_RELEASE=MT
+  -DLLVM_USE_CRT_DEBUG=MTd
+  -DLLVM_INCLUDE_TESTS=OFF
+  -DLLVM_TARGETS_TO_BUILD=X86
+  -DLLVM_INCLUDE_EXAMPLES=OFF
+  -DLLVM_ENABLE_TERMINFO=OFF
 )
 
 if(WIN32)
-	set(LLVM_GENERATOR "Ninja")
+  set(LLVM_GENERATOR "Ninja")
 else()
-	set(LLVM_GENERATOR "Unix Makefiles")
+  set(LLVM_GENERATOR "Unix Makefiles")
 endif()
 
 # short project name due to long filename issues on windows
 ExternalProject_Add(ll
-	URL ${LLVM_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${LLVM_HASH}
-	CMAKE_GENERATOR ${LLVM_GENERATOR}
-	PREFIX ${BUILD_DIR}/ll
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/llvm
+  URL ${LLVM_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${LLVM_HASH}
+  CMAKE_GENERATOR ${LLVM_GENERATOR}
+  PREFIX ${BUILD_DIR}/ll
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/llvm
 )
 
 if(MSVC)
-	if(BUILD_MODE STREQUAL Release)
-		set(LLVM_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/ ${HARVEST_TARGET}/llvm/ )
-	else()
-		set(LLVM_HARVEST_COMMAND
-			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
-			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include/ ${HARVEST_TARGET}/llvm/debug/include/
-		)
-	endif()
-	ExternalProject_Add_Step(ll after_install
-		COMMAND ${LLVM_HARVEST_COMMAND}
-		DEPENDEES mkdir update patch download configure build install
-	)
+  if(BUILD_MODE STREQUAL Release)
+    set(LLVM_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/ ${HARVEST_TARGET}/llvm/ )
+  else()
+    set(LLVM_HARVEST_COMMAND
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
+      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include/ ${HARVEST_TARGET}/llvm/debug/include/
+    )
+  endif()
+  ExternalProject_Add_Step(ll after_install
+    COMMAND ${LLVM_HARVEST_COMMAND}
+    DEPENDEES mkdir update patch download configure build install
+  )
 endif()
diff --git a/build_files/build_environment/cmake/lzma.cmake b/build_files/build_environment/cmake/lzma.cmake
index ef8adde2930..ecceb1172b4 100644
--- a/build_files/build_environment/cmake/lzma.cmake
+++ b/build_files/build_environment/cmake/lzma.cmake
@@ -19,14 +19,14 @@
 set(LZMA_PATCH_CMD echo .)
 
 ExternalProject_Add(external_lzma
-	URL ${LZMA_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${LZMA_HASH}
-	PREFIX ${BUILD_DIR}/lzma
-	PATCH_COMMAND ${LZMA_PATCH_CMD}
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lzma
-		--disable-shared
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && make install
-	INSTALL_DIR ${LIBDIR}/lzma
+  URL ${LZMA_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH SHA256=${LZMA_HASH}
+  PREFIX ${BUILD_DIR}/lzma
+  PATCH_COMMAND ${LZMA_PATCH_CMD}
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lzma
+    --disable-shared
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && make install
+  INSTALL_DIR ${LIBDIR}/lzma
 )
diff --git a/build_files/build_environment/cmake/numpy.cmake b/build_files/build_environment/cmake/numpy.cmake
index 698fae4f666..1a6ffa95ad6 100644
--- a/build_files/build_environment/cmake/numpy.cmake
+++ b/build_files/build_environment/cmake/numpy.cmake
@@ -17,50 +17,50 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(MSVC)
-	if(BUILD_MODE STREQUAL Debug)
-		set(NUMPY_DIR_POSTFIX -pydebug)
-		set(NUMPY_ARCHIVE_POSTFIX d)
-		set(NUMPY_BUILD_OPTION --debug)
-	else()
-		set(NUMPY_DIR_POSTFIX)
-		set(NUMPY_ARCHIVE_POSTFIX)
-		set(NUMPY_BUILD_OPTION)
-	endif()
+  if(BUILD_MODE STREQUAL Debug)
+    set(NUMPY_DIR_POSTFIX -pydebug)
+    set(NUMPY_ARCHIVE_POSTFIX d)
+    set(NUMPY_BUILD_OPTION --debug)
+  else()
+    set(NUMPY_DIR_POSTFIX)
+    set(NUMPY_ARCHIVE_POSTFIX)
+    set(NUMPY_BUILD_OPTION)
+  endif()
 endif()
 
 set(NUMPY_POSTFIX)
 
 if(WIN32)
-	set(NUMPY_INSTALL
-		${CMAKE_COMMAND} -E copy_directory "${BUILD_DIR}/python/src/external_python/run/lib/site-packages/numpy/core/include/numpy" "${LIBDIR}/python/include/python${PYTHON_SHORT_VERSION}/numpy" &&
-		${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-${PYTHON_SHORT_VERSION}${NUMPY_DIR_POSTFIX}"
-		${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz" "."
-	)
+  set(NUMPY_INSTALL
+    ${CMAKE_COMMAND} -E copy_directory "${BUILD_DIR}/python/src/external_python/run/lib/site-packages/numpy/core/include/numpy" "${LIBDIR}/python/include/python${PYTHON_SHORT_VERSION}/numpy" &&
+    ${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-${PYTHON_SHORT_VERSION}${NUMPY_DIR_POSTFIX}"
+    ${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz" "."
+  )
 else()
-	set(NUMPY_INSTALL echo .)
-	set(NUMPY_PATCH echo .)
+  set(NUMPY_INSTALL echo .)
+  set(NUMPY_PATCH echo .)
 endif()
 
 ExternalProject_Add(external_numpy
-	URL ${NUMPY_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${NUMPY_HASH}
-	PREFIX ${BUILD_DIR}/numpy
-	PATCH_COMMAND ${NUMPY_PATCH}
-	CONFIGURE_COMMAND ""
-	LOG_BUILD 1
-	BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable
-	INSTALL_COMMAND ${NUMPY_INSTALL}
+  URL ${NUMPY_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${NUMPY_HASH}
+  PREFIX ${BUILD_DIR}/numpy
+  PATCH_COMMAND ${NUMPY_PATCH}
+  CONFIGURE_COMMAND ""
+  LOG_BUILD 1
+  BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable
+  INSTALL_COMMAND ${NUMPY_INSTALL}
 )
 
 if(WIN32)
-	ExternalProject_Add_Step(external_numpy after_install
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz
-			DEPENDEES install
-		)
+  ExternalProject_Add_Step(external_numpy after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz
+      DEPENDEES install
+    )
 endif()
 
 add_dependencies(
-	external_numpy
-	Make_Python_Environment
+  external_numpy
+  Make_Python_Environment
 )
diff --git a/build_files/build_environment/cmake/ogg.cmake b/build_files/build_environment/cmake/ogg.cmake
index 1f69cee0996..e2d0f0905b8 100644
--- a/build_files/build_environment/cmake/ogg.cmake
+++ b/build_files/build_environment/cmake/ogg.cmake
@@ -17,16 +17,16 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_ogg
-	URL ${OGG_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${OGG_HASH}
-	PREFIX ${BUILD_DIR}/ogg
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ogg --disable-shared --enable-static
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && make install
-	INSTALL_DIR ${LIBDIR}/ogg
+  URL ${OGG_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH SHA256=${OGG_HASH}
+  PREFIX ${BUILD_DIR}/ogg
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ogg --disable-shared --enable-static
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && make install
+  INSTALL_DIR ${LIBDIR}/ogg
 )
 
 if(MSVC)
-	set_target_properties(external_ogg PROPERTIES FOLDER Mingw)
+  set_target_properties(external_ogg PROPERTIES FOLDER Mingw)
 endif()
diff --git a/build_files/build_environment/cmake/openal.cmake b/build_files/build_environment/cmake/openal.cmake
index 7a693b1fce2..44f6cdf72a3 100644
--- a/build_files/build_environment/cmake/openal.cmake
+++ b/build_files/build_environment/cmake/openal.cmake
@@ -17,51 +17,51 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(BUILD_MODE STREQUAL Release)
-	set(OPENAL_EXTRA_ARGS
-		-DALSOFT_UTILS=OFF
-		-DALSOFT_NO_CONFIG_UTIL=ON
-		-DALSOFT_EXAMPLES=OFF
-		-DALSOFT_TESTS=OFF
-		-DALSOFT_CONFIG=OFF
-		-DALSOFT_HRTF_DEFS=OFF
-		-DALSOFT_INSTALL=ON
-		-DALSOFT_BACKEND_SNDIO=OFF
-	)
+  set(OPENAL_EXTRA_ARGS
+    -DALSOFT_UTILS=OFF
+    -DALSOFT_NO_CONFIG_UTIL=ON
+    -DALSOFT_EXAMPLES=OFF
+    -DALSOFT_TESTS=OFF
+    -DALSOFT_CONFIG=OFF
+    -DALSOFT_HRTF_DEFS=OFF
+    -DALSOFT_INSTALL=ON
+    -DALSOFT_BACKEND_SNDIO=OFF
+  )
 
-	if(UNIX)
-		set(OPENAL_EXTRA_ARGS
-			${OPENAL_EXTRA_ARGS}
-			-DLIBTYPE=STATIC
-		)
-	endif()
+  if(UNIX)
+    set(OPENAL_EXTRA_ARGS
+      ${OPENAL_EXTRA_ARGS}
+      -DLIBTYPE=STATIC
+    )
+  endif()
 
-	if(UNIX AND NOT APPLE)
-		# Ensure we have backends for playback.
-		set(OPENAL_EXTRA_ARGS
-			${OPENAL_EXTRA_ARGS}
-			-DALSOFT_REQUIRE_ALSA=ON
-			-DALSOFT_REQUIRE_OSS=ON
-			-DALSOFT_REQUIRE_PULSEAUDIO=ON
-		)
-	endif()
+  if(UNIX AND NOT APPLE)
+    # Ensure we have backends for playback.
+    set(OPENAL_EXTRA_ARGS
+      ${OPENAL_EXTRA_ARGS}
+      -DALSOFT_REQUIRE_ALSA=ON
+      -DALSOFT_REQUIRE_OSS=ON
+      -DALSOFT_REQUIRE_PULSEAUDIO=ON
+    )
+  endif()
 
-	ExternalProject_Add(external_openal
-		URL ${OPENAL_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH MD5=${OPENAL_HASH}
-		PREFIX ${BUILD_DIR}/openal
-		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
-		INSTALL_DIR ${LIBDIR}/openal
-		PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff
-	)
+  ExternalProject_Add(external_openal
+    URL ${OPENAL_URI}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH MD5=${OPENAL_HASH}
+    PREFIX ${BUILD_DIR}/openal
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/openal
+    PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff
+  )
 
-	if(WIN32)
-		ExternalProject_Add_Step(external_openal after_install
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/lib/openal32.lib ${HARVEST_TARGET}/openal/lib/openal32.lib
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/bin/openal32.dll ${HARVEST_TARGET}/openal/lib/openal32.dll
-			COMMAND	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openal/include/ ${HARVEST_TARGET}/openal/include/
-			DEPENDEES install
-		)
-	endif()
+  if(WIN32)
+    ExternalProject_Add_Step(external_openal after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/lib/openal32.lib ${HARVEST_TARGET}/openal/lib/openal32.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/bin/openal32.dll ${HARVEST_TARGET}/openal/lib/openal32.dll
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openal/include/ ${HARVEST_TARGET}/openal/include/
+      DEPENDEES install
+    )
+  endif()
 
 endif()
diff --git a/build_files/build_environment/cmake/opencollada.cmake b/build_files/build_environment/cmake/opencollada.cmake
index ec3dcde1607..e1a8abc40ce 100644
--- a/build_files/build_environment/cmake/opencollada.cmake
+++ b/build_files/build_environment/cmake/opencollada.cmake
@@ -17,49 +17,49 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(UNIX)
-	set(OPENCOLLADA_EXTRA_ARGS
-		-DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2
-		-DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2.a)
+  set(OPENCOLLADA_EXTRA_ARGS
+    -DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2
+    -DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2.a)
 endif()
 
 ExternalProject_Add(external_opencollada
-	URL ${OPENCOLLADA_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${OPENCOLLADA_HASH}
-	PREFIX ${BUILD_DIR}/opencollada
-	PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencollada/src/external_opencollada < ${PATCH_DIR}/opencollada.diff
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencollada ${DEFAULT_CMAKE_FLAGS} ${OPENCOLLADA_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/opencollada
+  URL ${OPENCOLLADA_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${OPENCOLLADA_HASH}
+  PREFIX ${BUILD_DIR}/opencollada
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencollada/src/external_opencollada < ${PATCH_DIR}/opencollada.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencollada ${DEFAULT_CMAKE_FLAGS} ${OPENCOLLADA_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/opencollada
 )
 
 if(UNIX)
-	add_dependencies(
-		external_opencollada
-		external_xml2
-	)
+  add_dependencies(
+    external_opencollada
+    external_xml2
+  )
 endif()
 
 if(WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_opencollada after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/ ${HARVEST_TARGET}/opencollada/
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_opencollada after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/buffer.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/buffer_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/ftoa.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/ftoa_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/GeneratedSaxParser.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/GeneratedSaxParser_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/MathMLSolver.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/MathMLSolver_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADABaseUtils.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADABaseUtils_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAFramework.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAFramework_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/pcre.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/pcre_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/UTF.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/UTF_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/xml.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/xml_d.lib
-			DEPENDEES install
-		)
-	endif()
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_opencollada after_install
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/ ${HARVEST_TARGET}/opencollada/
+      DEPENDEES install
+    )
+  endif()
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(external_opencollada after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/buffer.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/buffer_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/ftoa.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/ftoa_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/GeneratedSaxParser.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/GeneratedSaxParser_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/MathMLSolver.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/MathMLSolver_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADABaseUtils.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADABaseUtils_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAFramework.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAFramework_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/pcre.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/pcre_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/UTF.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/UTF_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/xml.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/xml_d.lib
+      DEPENDEES install
+    )
+  endif()
 endif()
diff --git a/build_files/build_environment/cmake/opencolorio.cmake b/build_files/build_environment/cmake/opencolorio.cmake
index c0187e8a27e..0f6b8fee673 100644
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -17,96 +17,96 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(OPENCOLORIO_EXTRA_ARGS
-	-DOCIO_BUILD_APPS=OFF
-	-DOCIO_BUILD_PYGLUE=OFF
-	-DOCIO_BUILD_NUKE=OFF
-	-DOCIO_USE_BOOST_PTR=OFF
-	-DOCIO_BUILD_STATIC=ON
-	-DOCIO_BUILD_SHARED=OFF
-	-DOCIO_BUILD_TRUELIGHT=OFF
-	-DOCIO_BUILD_DOCS=OFF
-	-DOCIO_BUILD_PYGLUE=OFF
-	-DOCIO_BUILD_JNIGLUE=OFF
-	-DOCIO_STATIC_JNIGLUE=OFF
+  -DOCIO_BUILD_APPS=OFF
+  -DOCIO_BUILD_PYGLUE=OFF
+  -DOCIO_BUILD_NUKE=OFF
+  -DOCIO_USE_BOOST_PTR=OFF
+  -DOCIO_BUILD_STATIC=ON
+  -DOCIO_BUILD_SHARED=OFF
+  -DOCIO_BUILD_TRUELIGHT=OFF
+  -DOCIO_BUILD_DOCS=OFF
+  -DOCIO_BUILD_PYGLUE=OFF
+  -DOCIO_BUILD_JNIGLUE=OFF
+  -DOCIO_STATIC_JNIGLUE=OFF
 )
 
 if(WIN32)
-	set(OCIO_PATCH opencolorio_win.diff)
-	set(OPENCOLORIO_EXTRA_ARGS
-		${OPENCOLORIO_EXTRA_ARGS}
-		-DOCIO_BUILD_TESTS=OFF
-		-DOCIO_USE_SSE=ON
-		-DOCIO_INLINES_HIDDEN=OFF
-		-DOCIO_PYGLUE_LINK=OFF
-		-DOCIO_PYGLUE_RESPECT_ABI=OFF
-		-DOCIO_PYGLUE_SONAME=OFF
-		-DOCIO_PYGLUE_LIB_PREFIX=OFF
-		-DUSE_EXTERNAL_TINYXML=ON
-		-DTINYXML_INCLUDE_DIR=${LIBDIR}/tinyxml/include
-		-DTINYXML_LIBRARY=${LIBDIR}/tinyxml/lib/tinyxml${libext}
-		-DUSE_EXTERNAL_YAML=ON
-		-DYAML_CPP_FOUND=ON
-		-DYAML_CPP_VERSION=${YAMLCPP_VERSION}
-		-DUSE_EXTERNAL_LCMS=ON
-		-DINC_1=${LIBDIR}/tinyxml/include
-		-DINC_2=${LIBDIR}/yamlcpp/include
-		#lie because ocio cmake is demanding boost even though it is not needed
-		-DYAML_CPP_VERSION=0.5.0
-	)
+  set(OCIO_PATCH opencolorio_win.diff)
+  set(OPENCOLORIO_EXTRA_ARGS
+    ${OPENCOLORIO_EXTRA_ARGS}
+    -DOCIO_BUILD_TESTS=OFF
+    -DOCIO_USE_SSE=ON
+    -DOCIO_INLINES_HIDDEN=OFF
+    -DOCIO_PYGLUE_LINK=OFF
+    -DOCIO_PYGLUE_RESPECT_ABI=OFF
+    -DOCIO_PYGLUE_SONAME=OFF
+    -DOCIO_PYGLUE_LIB_PREFIX=OFF
+    -DUSE_EXTERNAL_TINYXML=ON
+    -DTINYXML_INCLUDE_DIR=${LIBDIR}/tinyxml/include
+    -DTINYXML_LIBRARY=${LIBDIR}/tinyxml/lib/tinyxml${libext}
+    -DUSE_EXTERNAL_YAML=ON
+    -DYAML_CPP_FOUND=ON
+    -DYAML_CPP_VERSION=${YAMLCPP_VERSION}
+    -DUSE_EXTERNAL_LCMS=ON
+    -DINC_1=${LIBDIR}/tinyxml/include
+    -DINC_2=${LIBDIR}/yamlcpp/include
+    #lie because ocio cmake is demanding boost even though it is not needed
+    -DYAML_CPP_VERSION=0.5.0
+  )
 else()
-	set(OCIO_PATCH opencolorio.diff)
-	set(OPENCOLORIO_EXTRA_ARGS
-		${OPENCOLORIO_EXTRA_ARGS}
-	)
+  set(OCIO_PATCH opencolorio.diff)
+  set(OPENCOLORIO_EXTRA_ARGS
+    ${OPENCOLORIO_EXTRA_ARGS}
+  )
 endif()
 
 ExternalProject_Add(external_opencolorio
-	URL ${OPENCOLORIO_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${OPENCOLORIO_HASH}
-	PREFIX ${BUILD_DIR}/opencolorio
-	PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/${OCIO_PATCH}
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencolorio ${DEFAULT_CMAKE_FLAGS} ${OPENCOLORIO_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/opencolorio
+  URL ${OPENCOLORIO_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${OPENCOLORIO_HASH}
+  PREFIX ${BUILD_DIR}/opencolorio
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/${OCIO_PATCH}
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencolorio ${DEFAULT_CMAKE_FLAGS} ${OPENCOLORIO_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/opencolorio
 )
 
 if(NOT WIN32)
-	add_custom_command(
-		OUTPUT ${LIBDIR}/opencolorio/lib/libtinyxml.a
-		COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libtinyxml.a ${LIBDIR}/opencolorio/lib/libtinyxml.a
-		COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libyaml-cpp.a ${LIBDIR}/opencolorio/lib/libyaml-cpp.a
-	)
-	add_custom_target(external_opencolorio_extra ALL DEPENDS external_opencolorio ${LIBDIR}/opencolorio/lib/libtinyxml.a)
+  add_custom_command(
+    OUTPUT ${LIBDIR}/opencolorio/lib/libtinyxml.a
+    COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libtinyxml.a ${LIBDIR}/opencolorio/lib/libtinyxml.a
+    COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libyaml-cpp.a ${LIBDIR}/opencolorio/lib/libyaml-cpp.a
+  )
+  add_custom_target(external_opencolorio_extra ALL DEPENDS external_opencolorio ${LIBDIR}/opencolorio/lib/libtinyxml.a)
 endif()
 
 add_dependencies(
-	external_opencolorio
-	external_boost
+  external_opencolorio
+  external_boost
 )
 
 if(WIN32)
-	add_dependencies(
-		external_opencolorio
-		external_tinyxml
-		external_yamlcpp
+  add_dependencies(
+    external_opencolorio
+    external_tinyxml
+    external_yamlcpp
 
-	)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_opencolorio after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/include ${HARVEST_TARGET}/opencolorio/include
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib/static ${HARVEST_TARGET}/opencolorio/lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmt.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib ${HARVEST_TARGET}/opencolorio/lib/tinyxml.lib
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_opencolorio after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/static/Opencolorio.lib ${HARVEST_TARGET}/opencolorio/lib/OpencolorIO_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmtd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib ${HARVEST_TARGET}/opencolorio/lib/tinyxml_d.lib
-			DEPENDEES install
-		)
-	endif()
+  )
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_opencolorio after_install
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/include ${HARVEST_TARGET}/opencolorio/include
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib/static ${HARVEST_TARGET}/opencolorio/lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmt.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib ${HARVEST_TARGET}/opencolorio/lib/tinyxml.lib
+      DEPENDEES install
+    )
+  endif()
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(external_opencolorio after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/static/Opencolorio.lib ${HARVEST_TARGET}/opencolorio/lib/OpencolorIO_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmtd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib ${HARVEST_TARGET}/opencolorio/lib/tinyxml_d.lib
+      DEPENDEES install
+    )
+  endif()
 
 endif()
diff --git a/build_files/build_environment/cmake/openexr.cmake b/build_files/build_environment/cmake/openexr.cmake
index 59e9a46b4f8..7ac85ab9bdf 100644
--- a/build_files/build_environment/cmake/openexr.cmake
+++ b/build_files/build_environment/cmake/openexr.cmake
@@ -17,62 +17,62 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-	set(OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
-	set(OPENEXR_EXTRA_ARGS
-		-DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES}
-		-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-		-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-		-DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase
-		-DOPENEXR_BUILD_ILMBASE=On
-		-DOPENEXR_BUILD_OPENEXR=On
-		-DOPENEXR_BUILD_PYTHON_LIBS=Off
-		-DOPENEXR_BUILD_STATIC=On
-		-DOPENEXR_BUILD_SHARED=Off
-		-DOPENEXR_BUILD_TESTS=Off
-		-DOPENEXR_BUILD_VIEWERS=Off
-		-DOPENEXR_BUILD_UTILS=Off
-		-DOPENEXR_NAMESPACE_VERSIONING=Off
-	)
-	ExternalProject_Add(external_openexr
-		URL ${OPENEXR_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH MD5=${OPENEXR_HASH}
-		PREFIX ${BUILD_DIR}/openexr
-		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
-		INSTALL_DIR ${LIBDIR}/openexr
-	)
+  set(OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
+  set(OPENEXR_EXTRA_ARGS
+    -DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES}
+    -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+    -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+    -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase
+    -DOPENEXR_BUILD_ILMBASE=On
+    -DOPENEXR_BUILD_OPENEXR=On
+    -DOPENEXR_BUILD_PYTHON_LIBS=Off
+    -DOPENEXR_BUILD_STATIC=On
+    -DOPENEXR_BUILD_SHARED=Off
+    -DOPENEXR_BUILD_TESTS=Off
+    -DOPENEXR_BUILD_VIEWERS=Off
+    -DOPENEXR_BUILD_UTILS=Off
+    -DOPENEXR_NAMESPACE_VERSIONING=Off
+  )
+  ExternalProject_Add(external_openexr
+    URL ${OPENEXR_URI}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH MD5=${OPENEXR_HASH}
+    PREFIX ${BUILD_DIR}/openexr
+    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
+    INSTALL_DIR ${LIBDIR}/openexr
+  )
 
-	ExternalProject_Add_Step(external_openexr after_install
-		COMMAND	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib
-		#libs have moved between versions, just duplicate it for now.
-		COMMAND	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${LIBDIR}/ilmbase/lib
-		COMMAND	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include
-		DEPENDEES install
-	)
+  ExternalProject_Add_Step(external_openexr after_install
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib
+    #libs have moved between versions, just duplicate it for now.
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${LIBDIR}/ilmbase/lib
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include
+    DEPENDEES install
+  )
 
 else()
-	set(OPENEXR_PKG_CONFIG_PATH ${LIBDIR}/zlib/share/pkgconfig)
-	set(OPENEXR_EXTRA_ARGS
-	  --enable-static
-	  --disable-shared
-	  --enable-cxxstd=11
-	  --with-ilmbase-prefix=${LIBDIR}/ilmbase
-	  )
+  set(OPENEXR_PKG_CONFIG_PATH ${LIBDIR}/zlib/share/pkgconfig)
+  set(OPENEXR_EXTRA_ARGS
+    --enable-static
+    --disable-shared
+    --enable-cxxstd=11
+    --with-ilmbase-prefix=${LIBDIR}/ilmbase
+    )
 
-	ExternalProject_Add(external_openexr
-		URL ${OPENEXR_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH MD5=${OPENEXR_HASH}
-		PREFIX ${BUILD_DIR}/openexr
-		CONFIGURE_COMMAND ${CONFIGURE_ENV} && export PKG_CONFIG_PATH=${OPENEXR_PKG_CONFIG_PATH} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/openexr ${OPENEXR_EXTRA_ARGS}
-		BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && make -j${MAKE_THREADS}
-		INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && make install
-		INSTALL_DIR ${LIBDIR}/openexr
-	)
+  ExternalProject_Add(external_openexr
+    URL ${OPENEXR_URI}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH MD5=${OPENEXR_HASH}
+    PREFIX ${BUILD_DIR}/openexr
+    CONFIGURE_COMMAND ${CONFIGURE_ENV} && export PKG_CONFIG_PATH=${OPENEXR_PKG_CONFIG_PATH} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/openexr ${OPENEXR_EXTRA_ARGS}
+    BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && make -j${MAKE_THREADS}
+    INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && make install
+    INSTALL_DIR ${LIBDIR}/openexr
+  )
 endif()
 
 add_dependencies(
-	external_openexr
-	external_zlib
-	external_ilmbase
+  external_openexr
+  external_zlib
+  external_ilmbase
 )
diff --git a/build_files/build_environment/cmake/openimageio.cmake b/build_files/build_environment/cmake/openimageio.cmake
index 73d1f4a7871..920e9ee0273 100644
--- a/build_files/build_environment/cmake/openimageio.cmake
+++ b/build_files/build_environment/cmake/openimageio.cmake
@@ -17,136 +17,136 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(BUILD_MODE STREQUAL Release)
-	set(OIIO_TOOLS ON)
+  set(OIIO_TOOLS ON)
 else()
-	set(OIIO_TOOLS OFF)
+  set(OIIO_TOOLS OFF)
 endif()
 
 if(UNIX AND NOT APPLE)
-	# This causes linking to static pthread libraries which gives link errors.
-	# Since we manually specify library paths it should static link other libs.
-	set(OPENIMAGEIO_LINKSTATIC -DLINKSTATIC=OFF)
+  # This causes linking to static pthread libraries which gives link errors.
+  # Since we manually specify library paths it should static link other libs.
+  set(OPENIMAGEIO_LINKSTATIC -DLINKSTATIC=OFF)
 else()
-	set(OPENIMAGEIO_LINKSTATIC -DLINKSTATIC=ON)
+  set(OPENIMAGEIO_LINKSTATIC -DLINKSTATIC=ON)
 endif()
 
 if(WIN32)
-	set(PNG_LIBNAME libpng16_static${LIBEXT})
-	set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2 -DOPJ_STATIC=1)
-	set(OPENJPEG_POSTFIX _msvc)
+  set(PNG_LIBNAME libpng16_static${LIBEXT})
+  set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2 -DOPJ_STATIC=1)
+  set(OPENJPEG_POSTFIX _msvc)
 else()
-	set(PNG_LIBNAME libpng${LIBEXT})
-	set(OIIO_SIMD_FLAGS)
+  set(PNG_LIBNAME libpng${LIBEXT})
+  set(OIIO_SIMD_FLAGS)
 endif()
 
 if(WITH_WEBP)
-	set(WEBP_ARGS
-		-DWEBP_INCLUDE_DIR=${LIBDIR}/webp/include
-		-DWEBP_LIBRARY=${LIBDIR}/webp/lib/${LIBPREFIX}webp${LIBEXT}
-	)
-	set(WEBP_DEP external_webp)
+  set(WEBP_ARGS
+    -DWEBP_INCLUDE_DIR=${LIBDIR}/webp/include
+    -DWEBP_LIBRARY=${LIBDIR}/webp/lib/${LIBPREFIX}webp${LIBEXT}
+  )
+  set(WEBP_DEP external_webp)
 endif()
 
 if(MSVC)
-	set(OPENJPEG_FLAGS
-		-DOPENJPEG_HOME=${LIBDIR}/openjpeg_msvc
-		-DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg_msvc/include/openjpeg-${OPENJPEG_SHORT_VERSION}
-		-DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
-		-DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
-	)
+  set(OPENJPEG_FLAGS
+    -DOPENJPEG_HOME=${LIBDIR}/openjpeg_msvc
+    -DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg_msvc/include/openjpeg-${OPENJPEG_SHORT_VERSION}
+    -DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
+    -DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
+  )
 else()
-	set(OPENJPEG_FLAGS
-		-DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION}
-		-DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg/lib/${OPENJPEG_LIBRARY}
-	)
+  set(OPENJPEG_FLAGS
+    -DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION}
+    -DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg/lib/${OPENJPEG_LIBRARY}
+  )
 endif()
 
 set(OPENIMAGEIO_EXTRA_ARGS
-	-DBUILDSTATIC=ON
-	${OPENIMAGEIO_LINKSTATIC}
-	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/openexr/
-	-DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-	-DBoost_USE_MULTITHREADED=ON
-	-DBoost_USE_STATIC_LIBS=ON
-	-DBoost_USE_STATIC_RUNTIME=ON
-	-DBOOST_ROOT=${LIBDIR}/boost
-	-DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
-	-DBoost_NO_SYSTEM_PATHS=ON
-	-OIIO_BUILD_CPP11=ON
-	-DUSE_OPENGL=OFF
-	-DUSE_TBB=OFF
-	-DUSE_FIELD3D=OFF
-	-DUSE_QT=OFF
-	-DUSE_PYTHON=OFF
-	-DUSE_GIF=OFF
-	-DUSE_OPENCV=OFF
-	-DUSE_OPENSSL=OFF
-	-DUSE_OPENJPEG=ON
-	-DUSE_FFMPEG=OFF
-	-DUSE_PTEX=OFF
-	-DUSE_FREETYPE=OFF
-	-DUSE_LIBRAW=OFF
-	-DUSE_PYTHON=OFF
-	-DUSE_PYTHON3=OFF
-	-DUSE_OCIO=OFF
-	-DUSE_WEBP=${WITH_WEBP}
-	-DOIIO_BUILD_TOOLS=${OIIO_TOOLS}
-	-DOIIO_BUILD_TESTS=OFF
-	-DBUILD_TESTING=OFF
-	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
-	-DPNG_LIBRARY=${LIBDIR}/png/lib/${PNG_LIBNAME}
-	-DPNG_PNG_INCLUDE_DIR=${LIBDIR}/png/include
-	-DTIFF_LIBRARY=${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT}
-	-DTIFF_INCLUDE_DIR=${LIBDIR}/tiff/include
-	-DJPEG_LIBRARY=${LIBDIR}/jpg/lib/${JPEG_LIBRARY}
-	-DJPEG_INCLUDE_DIR=${LIBDIR}/jpg/include
-	${OPENJPEG_FLAGS}
-	-DOCIO_PATH=${LIBDIR}/opencolorio/
-	-DOpenEXR_USE_STATIC_LIBS=On
-	-DOPENEXR_HOME=${LIBDIR}/openexr/
-	-DILMBASE_INCLUDE_PATH=${LIBDIR}/ilmbase/
-	-DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase/
-	-DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
-	-DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
-	-DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-	-DSTOP_ON_WARNING=OFF
-	${WEBP_FLAGS}
-	${OIIO_SIMD_FLAGS}
+  -DBUILDSTATIC=ON
+  ${OPENIMAGEIO_LINKSTATIC}
+  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/openexr/
+  -DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+  -DBoost_USE_MULTITHREADED=ON
+  -DBoost_USE_STATIC_LIBS=ON
+  -DBoost_USE_STATIC_RUNTIME=ON
+  -DBOOST_ROOT=${LIBDIR}/boost
+  -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
+  -DBoost_NO_SYSTEM_PATHS=ON
+  -OIIO_BUILD_CPP11=ON
+  -DUSE_OPENGL=OFF
+  -DUSE_TBB=OFF
+  -DUSE_FIELD3D=OFF
+  -DUSE_QT=OFF
+  -DUSE_PYTHON=OFF
+  -DUSE_GIF=OFF
+  -DUSE_OPENCV=OFF
+  -DUSE_OPENSSL=OFF
+  -DUSE_OPENJPEG=ON
+  -DUSE_FFMPEG=OFF
+  -DUSE_PTEX=OFF
+  -DUSE_FREETYPE=OFF
+  -DUSE_LIBRAW=OFF
+  -DUSE_PYTHON=OFF
+  -DUSE_PYTHON3=OFF
+  -DUSE_OCIO=OFF
+  -DUSE_WEBP=${WITH_WEBP}
+  -DOIIO_BUILD_TOOLS=${OIIO_TOOLS}
+  -DOIIO_BUILD_TESTS=OFF
+  -DBUILD_TESTING=OFF
+  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
+  -DPNG_LIBRARY=${LIBDIR}/png/lib/${PNG_LIBNAME}
+  -DPNG_PNG_INCLUDE_DIR=${LIBDIR}/png/include
+  -DTIFF_LIBRARY=${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT}
+  -DTIFF_INCLUDE_DIR=${LIBDIR}/tiff/include
+  -DJPEG_LIBRARY=${LIBDIR}/jpg/lib/${JPEG_LIBRARY}
+  -DJPEG_INCLUDE_DIR=${LIBDIR}/jpg/include
+  ${OPENJPEG_FLAGS}
+  -DOCIO_PATH=${LIBDIR}/opencolorio/
+  -DOpenEXR_USE_STATIC_LIBS=On
+  -DOPENEXR_HOME=${LIBDIR}/openexr/
+  -DILMBASE_INCLUDE_PATH=${LIBDIR}/ilmbase/
+  -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase/
+  -DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
+  -DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
+  -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DSTOP_ON_WARNING=OFF
+  ${WEBP_FLAGS}
+  ${OIIO_SIMD_FLAGS}
 )
 
 ExternalProject_Add(external_openimageio
-	URL ${OPENIMAGEIO_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${OPENIMAGEIO_HASH}
-	PREFIX ${BUILD_DIR}/openimageio
-	PATCH_COMMAND
-		${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/src/include < ${PATCH_DIR}/openimageio_gdi.diff &&
-		${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_static_libs.diff
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/openimageio
+  URL ${OPENIMAGEIO_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${OPENIMAGEIO_HASH}
+  PREFIX ${BUILD_DIR}/openimageio
+  PATCH_COMMAND
+    ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/src/include < ${PATCH_DIR}/openimageio_gdi.diff &&
+    ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_static_libs.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/openimageio
 )
 
 add_dependencies(
-	external_openimageio
-	external_png external_zlib
-	external_ilmbase
-	external_openexr
-	external_jpeg
-	external_boost
-	external_tiff
-	external_opencolorio
-	external_openjpeg${OPENJPEG_POSTFIX}
-	${WEBP_DEP}
+  external_openimageio
+  external_png external_zlib
+  external_ilmbase
+  external_openexr
+  external_jpeg
+  external_boost
+  external_tiff
+  external_opencolorio
+  external_openjpeg${OPENJPEG_POSTFIX}
+  ${WEBP_DEP}
 )
 if(NOT WIN32)
-	add_dependencies(
-		external_openimageio
-		external_opencolorio_extra
-	)
+  add_dependencies(
+    external_openimageio
+    external_opencolorio_extra
+  )
 endif()
diff --git a/build_files/build_environment/cmake/openjpeg.cmake b/build_files/build_environment/cmake/openjpeg.cmake
index ae320b78880..8cc52142ee0 100644
--- a/build_files/build_environment/cmake/openjpeg.cmake
+++ b/build_files/build_environment/cmake/openjpeg.cmake
@@ -22,43 +22,43 @@
 set(OPENJPEG_EXTRA_ARGS -DBUILD_SHARED_LIBS=OFF)
 
 if(WIN32)
-	set(OPENJPEG_EXTRA_ARGS -G "MSYS Makefiles" -DBUILD_PKGCONFIG_FILES=On)
+  set(OPENJPEG_EXTRA_ARGS -G "MSYS Makefiles" -DBUILD_PKGCONFIG_FILES=On)
 else()
-	set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
+  set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
 endif()
 
 ExternalProject_Add(external_openjpeg
-	URL ${OPENJPEG_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${OPENJPEG_HASH}
-	PREFIX ${BUILD_DIR}/openjpeg
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build && ${CMAKE_COMMAND} ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF ${BUILD_DIR}/openjpeg/src/external_openjpeg
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make install
-	INSTALL_DIR ${LIBDIR}/openjpeg
+  URL ${OPENJPEG_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH SHA256=${OPENJPEG_HASH}
+  PREFIX ${BUILD_DIR}/openjpeg
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build && ${CMAKE_COMMAND} ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF ${BUILD_DIR}/openjpeg/src/external_openjpeg
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make install
+  INSTALL_DIR ${LIBDIR}/openjpeg
 )
 
 #on windows ffmpeg wants a mingw build, while oiio needs a msvc build
 if(MSVC)
-	set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
-	ExternalProject_Add(external_openjpeg_msvc
-		URL ${OPENJPEG_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH SHA256=${OPENJPEG_HASH}
-		PREFIX ${BUILD_DIR}/openjpeg_msvc
-		CMAKE_ARGS ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF
-		INSTALL_DIR ${LIBDIR}/openjpeg_msvc
-	)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_openjpeg_msvc after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/lib ${HARVEST_TARGET}/openjpeg/lib &&
-					${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/include ${HARVEST_TARGET}/openjpeg/include
-			DEPENDEES install
-		)
-	endif()
+  set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
+  ExternalProject_Add(external_openjpeg_msvc
+    URL ${OPENJPEG_URI}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH SHA256=${OPENJPEG_HASH}
+    PREFIX ${BUILD_DIR}/openjpeg_msvc
+    CMAKE_ARGS ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF
+    INSTALL_DIR ${LIBDIR}/openjpeg_msvc
+  )
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_openjpeg_msvc after_install
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/lib ${HARVEST_TARGET}/openjpeg/lib &&
+          ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/include ${HARVEST_TARGET}/openjpeg/include
+      DEPENDEES install
+    )
+  endif()
 endif()
 
 set(OPENJPEG_LIBRARY libopenjp2${LIBEXT})
 if(MSVC)
-	set_target_properties(external_openjpeg PROPERTIES FOLDER Mingw)
+  set_target_properties(external_openjpeg PROPERTIES FOLDER Mingw)
 endif()
diff --git a/build_files/build_environment/cmake/openmp.cmake b/build_files/build_environment/cmake/openmp.cmake
index f9f5a5cfb63..05b590e4926 100644
--- a/build_files/build_environment/cmake/openmp.cmake
+++ b/build_files/build_environment/cmake/openmp.cmake
@@ -18,16 +18,16 @@
 
 
 ExternalProject_Add(external_openmp
-	URL ${OPENMP_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${OPENMP_HASH}
-	PREFIX ${BUILD_DIR}/openmp
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS}
-	INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @executable_path/../Resources/lib/libomp.dylib runtime/src/libomp.dylib && make install
-	INSTALL_DIR ${LIBDIR}/openmp
+  URL ${OPENMP_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${OPENMP_HASH}
+  PREFIX ${BUILD_DIR}/openmp
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS}
+  INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @executable_path/../Resources/lib/libomp.dylib runtime/src/libomp.dylib && make install
+  INSTALL_DIR ${LIBDIR}/openmp
 )
 
 add_dependencies(
-	external_openmp
-	external_clang
+  external_openmp
+  external_clang
 )
diff --git a/build_files/build_environment/cmake/opensubdiv.cmake b/build_files/build_environment/cmake/opensubdiv.cmake
index 217274431d5..a5cf4efd128 100644
--- a/build_files/build_environment/cmake/opensubdiv.cmake
+++ b/build_files/build_environment/cmake/opensubdiv.cmake
@@ -17,86 +17,86 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(OPENSUBDIV_EXTRA_ARGS
-	-DNO_EXAMPLES=ON
-	-DNO_REGRESSION=ON
-	-DNO_PYTHON=ON
-	-DNO_MAYA=ON
-	-DNO_PTEX=ON
-	-DNO_DOC=ON
-	-DNO_CLEW=OFF
-	-DNO_OPENCL=OFF
-	-DNO_TUTORIALS=ON
-	-DGLEW_INCLUDE_DIR=${LIBDIR}/glew/include
-	-DGLEW_LIBRARY=${LIBDIR}/glew/lib/libGLEW${LIBEXT}
-	-DGLFW_INCLUDE_DIR=${LIBDIR}/glfw/include
-	-DGLFW_LIBRARIES=${LIBDIR}/glfw/lib/glfw3${LIBEXT}
+  -DNO_EXAMPLES=ON
+  -DNO_REGRESSION=ON
+  -DNO_PYTHON=ON
+  -DNO_MAYA=ON
+  -DNO_PTEX=ON
+  -DNO_DOC=ON
+  -DNO_CLEW=OFF
+  -DNO_OPENCL=OFF
+  -DNO_TUTORIALS=ON
+  -DGLEW_INCLUDE_DIR=${LIBDIR}/glew/include
+  -DGLEW_LIBRARY=${LIBDIR}/glew/lib/libGLEW${LIBEXT}
+  -DGLFW_INCLUDE_DIR=${LIBDIR}/glfw/include
+  -DGLFW_LIBRARIES=${LIBDIR}/glfw/lib/glfw3${LIBEXT}
 )
 
 if(WIN32)
-	set(OPENSUBDIV_EXTRA_ARGS
-		${OPENSUBDIV_EXTRA_ARGS}
-		-DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
-		-DTBB_LIBRARIES=${LIBDIR}/tbb/lib/tbb_static.lib
-		-DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
-		-DCLEW_LIBRARY=${LIBDIR}/clew/lib/clew${LIBEXT}
-		-DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
-		-DCUEW_LIBRARY=${LIBDIR}/cuew/lib/cuew${LIBEXT}
-		-DCMAKE_EXE_LINKER_FLAGS_RELEASE=libcmt.lib
-	)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(OPENSUBDIV_EXTRA_ARGS
-			${OPENSUBDIV_EXTRA_ARGS}
-			-DNO_CUDA=OFF
-		)
-	else()
-		set(OPENSUBDIV_EXTRA_ARGS
-			${OPENSUBDIV_EXTRA_ARGS}
-			-DNO_CUDA=ON
-		)
-	endif()
+  set(OPENSUBDIV_EXTRA_ARGS
+    ${OPENSUBDIV_EXTRA_ARGS}
+    -DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
+    -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/tbb_static.lib
+    -DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
+    -DCLEW_LIBRARY=${LIBDIR}/clew/lib/clew${LIBEXT}
+    -DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
+    -DCUEW_LIBRARY=${LIBDIR}/cuew/lib/cuew${LIBEXT}
+    -DCMAKE_EXE_LINKER_FLAGS_RELEASE=libcmt.lib
+  )
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(OPENSUBDIV_EXTRA_ARGS
+      ${OPENSUBDIV_EXTRA_ARGS}
+      -DNO_CUDA=OFF
+    )
+  else()
+    set(OPENSUBDIV_EXTRA_ARGS
+      ${OPENSUBDIV_EXTRA_ARGS}
+      -DNO_CUDA=ON
+    )
+  endif()
 
 else()
-	set(OPENSUBDIV_EXTRA_ARGS
-		${OPENSUBDIV_EXTRA_ARGS}
-		-DNO_CUDA=ON
-		-DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
-		-DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
-		-DCLEW_LIBRARY=${LIBDIR}/clew/lib/static/${LIBPREFIX}clew${LIBEXT}
-	)
+  set(OPENSUBDIV_EXTRA_ARGS
+    ${OPENSUBDIV_EXTRA_ARGS}
+    -DNO_CUDA=ON
+    -DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
+    -DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
+    -DCLEW_LIBRARY=${LIBDIR}/clew/lib/static/${LIBPREFIX}clew${LIBEXT}
+  )
 endif()
 
 ExternalProject_Add(external_opensubdiv
-	URL ${OPENSUBDIV_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${OPENSUBDIV_Hash}
-	PREFIX ${BUILD_DIR}/opensubdiv
-	PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/opensubdiv/src/external_opensubdiv < ${PATCH_DIR}/opensubdiv.diff
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opensubdiv -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${OPENSUBDIV_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/opensubdiv
+  URL ${OPENSUBDIV_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${OPENSUBDIV_Hash}
+  PREFIX ${BUILD_DIR}/opensubdiv
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/opensubdiv/src/external_opensubdiv < ${PATCH_DIR}/opensubdiv.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opensubdiv -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${OPENSUBDIV_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/opensubdiv
 )
 
 if(WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_opensubdiv after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv/lib ${HARVEST_TARGET}/opensubdiv/lib
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv/include ${HARVEST_TARGET}/opensubdiv/include
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_opensubdiv after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdCPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdCPU_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdGPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdGPU_d.lib
-			DEPENDEES install
-		)
-	endif()
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_opensubdiv after_install
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv/lib ${HARVEST_TARGET}/opensubdiv/lib
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv/include ${HARVEST_TARGET}/opensubdiv/include
+      DEPENDEES install
+    )
+  endif()
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(external_opensubdiv after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdCPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdCPU_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdGPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdGPU_d.lib
+      DEPENDEES install
+    )
+  endif()
 endif()
 
 add_dependencies(
-	external_opensubdiv
-	external_glew
-	external_glfw
-	external_clew
-	external_cuew
-	external_tbb
+  external_opensubdiv
+  external_glew
+  external_glfw
+  external_clew
+  external_cuew
+  external_tbb
 )
diff --git a/build_files/build_environment/cmake/openvdb.cmake b/build_files/build_environment/cmake/openvdb.cmake
index 11456facbb2..215b3e8f2fe 100644
--- a/build_files/build_environment/cmake/openvdb.cmake
+++ b/build_files/build_environment/cmake/openvdb.cmake
@@ -17,86 +17,86 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(BUILD_MODE STREQUAL Debug)
-	set(BLOSC_POST _d)
+  set(BLOSC_POST _d)
 endif()
 
 set(OPENVDB_EXTRA_ARGS
-	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-	-DBoost_USE_MULTITHREADED=ON
-	-DBoost_USE_STATIC_LIBS=ON
-	-DBoost_USE_STATIC_RUNTIME=ON
-	-DBOOST_ROOT=${LIBDIR}/boost
-	-DBoost_NO_SYSTEM_PATHS=ON
-	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-	-DBLOSC_INCLUDE_DIR=${LIBDIR}/blosc/include/
-	-DBLOSC_blosc_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
-	-DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
-	-DOPENVDB_BUILD_UNITTESTS=Off
-	-DOPENVDB_BUILD_PYTHON_MODULE=Off
-	-DGLEW_LOCATION=${LIBDIR}/glew/
-	-DBLOSC_LOCATION=${LIBDIR}/blosc/
-	-DTBB_LOCATION=${LIBDIR}/tbb/
-	-DTBB_ROOT=${LIBDIR}/tbb/
-	-DOPENEXR_LOCATION=${LIBDIR}/openexr
-	-DILMBASE_LOCATION=${LIBDIR}/ilmbase
-	-DIlmbase_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DIlmbase_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DIlmbase_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOpenexr_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-	-DTBB_LIBRARYDIR=${LIBDIR}/tbb/lib
-	-DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
-	-DTBB_LIBRARY_PATH=${LIBDIR}/tbb/lib
+  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+  -DBoost_USE_MULTITHREADED=ON
+  -DBoost_USE_STATIC_LIBS=ON
+  -DBoost_USE_STATIC_RUNTIME=ON
+  -DBOOST_ROOT=${LIBDIR}/boost
+  -DBoost_NO_SYSTEM_PATHS=ON
+  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+  -DBLOSC_INCLUDE_DIR=${LIBDIR}/blosc/include/
+  -DBLOSC_blosc_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
+  -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
+  -DOPENVDB_BUILD_UNITTESTS=Off
+  -DOPENVDB_BUILD_PYTHON_MODULE=Off
+  -DGLEW_LOCATION=${LIBDIR}/glew/
+  -DBLOSC_LOCATION=${LIBDIR}/blosc/
+  -DTBB_LOCATION=${LIBDIR}/tbb/
+  -DTBB_ROOT=${LIBDIR}/tbb/
+  -DOPENEXR_LOCATION=${LIBDIR}/openexr
+  -DILMBASE_LOCATION=${LIBDIR}/ilmbase
+  -DIlmbase_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DIlmbase_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DIlmbase_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOpenexr_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DTBB_LIBRARYDIR=${LIBDIR}/tbb/lib
+  -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
+  -DTBB_LIBRARY_PATH=${LIBDIR}/tbb/lib
 )
 
 if(WIN32)
-	# Namespaces seem to be buggy and cause linker errors due to things not
-	# being in the correct namespace
-	# needs to link pthreads due to it being a blosc dependency
-	set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
-		-DOPENEXR_NAMESPACE_VERSIONING=OFF
-		-DEXTRA_LIBS:FILEPATH=${LIBDIR}/pthreads/lib/pthreadVC3.lib
-	)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-		set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
-			-DCMAKE_SHARED_LINKER_FLAGS="/safeseh:no"
-			-DCMAKE_EXE_LINKER_FLAGS="/safeseh:no"
-		)
-	endif()
+  # Namespaces seem to be buggy and cause linker errors due to things not
+  # being in the correct namespace
+  # needs to link pthreads due to it being a blosc dependency
+  set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
+    -DOPENEXR_NAMESPACE_VERSIONING=OFF
+    -DEXTRA_LIBS:FILEPATH=${LIBDIR}/pthreads/lib/pthreadVC3.lib
+  )
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+    set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
+      -DCMAKE_SHARED_LINKER_FLAGS="/safeseh:no"
+      -DCMAKE_EXE_LINKER_FLAGS="/safeseh:no"
+    )
+  endif()
 endif()
 
 ExternalProject_Add(openvdb
-	URL ${OPENVDB_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${OPENVDB_HASH}
-	PREFIX ${BUILD_DIR}/openvdb
-	PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb.diff
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/openvdb
+  URL ${OPENVDB_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${OPENVDB_HASH}
+  PREFIX ${BUILD_DIR}/openvdb
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/openvdb
 )
 
 add_dependencies(
-	openvdb
-	external_tbb
-	external_boost
-	external_ilmbase
-	external_openexr
-	external_zlib
-	external_blosc
+  openvdb
+  external_tbb
+  external_boost
+  external_ilmbase
+  external_openexr
+  external_zlib
+  external_blosc
 )
 
 if(WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(openvdb after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include ${HARVEST_TARGET}/openvdb/include
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(openvdb after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib
-			DEPENDEES install
-		)
-	endif()
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(openvdb after_install
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include ${HARVEST_TARGET}/openvdb/include
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
+      DEPENDEES install
+    )
+  endif()
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(openvdb after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib
+      DEPENDEES install
+    )
+  endif()
 endif()
diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake
index ac36c891976..d7acf25ba58 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -17,22 +17,22 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-	option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/lapack/fftw3 by installing mingw64" ON)
+  option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/lapack/fftw3 by installing mingw64" ON)
 endif()
 option(WITH_WEBP "Enable building of oiio with webp support" OFF)
 option(WITH_EMBREE "Enable building of Embree" OFF)
 set(MAKE_THREADS 1 CACHE STRING "Number of threads to run make with")
 
 if(NOT BUILD_MODE)
-	set(BUILD_MODE "Release")
-	message(STATUS "Build type not specified: defaulting to a release build.")
+  set(BUILD_MODE "Release")
+  message(STATUS "Build type not specified: defaulting to a release build.")
 endif()
 message("BuildMode = ${BUILD_MODE}")
 
 if(BUILD_MODE STREQUAL "Debug")
-	set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Debug)
+  set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Debug)
 else(BUILD_MODE STREQUAL "Debug")
-	set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Release)
+  set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Release)
 endif()
 
 option(DOWNLOAD_DIR "Path for downloaded files" ${CMAKE_CURRENT_SOURCE_DIR}/downloads)
@@ -46,173 +46,173 @@ message("PATCH_DIR = ${PATCH_DIR}")
 message("BUILD_DIR = ${BUILD_DIR}")
 
 if(WIN32)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/patch.exe)
-	else()
-		set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/patch.exe)
-	endif()
-	set(LIBEXT ".lib")
-	set(LIBPREFIX "")
-
-	# For OIIO and OSL
-	set(COMMON_DEFINES /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS)
-
-	if(MSVC_VERSION GREATER 1909)
-		set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings.
-	endif()
-	set(COMMON_MSVC_FLAGS "${COMMON_MSVC_FLAGS} /bigobj")
-	if(WITH_OPTIMIZED_DEBUG)
-		set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	else()
-		set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	endif()
-	set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MT ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MT ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MT ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-
-	if(WITH_OPTIMIZED_DEBUG)
-		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	else()
-		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /MTd  ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	endif()
-	set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MT /${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MT ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-
-	set(PLATFORM_FLAGS)
-	set(PLATFORM_CXX_FLAGS)
-	set(PLATFORM_CMAKE_FLAGS)
-
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw64)
-		set(MINGW_SHELL ming64sh.cmd)
-		set(PERL_SHELL ${DOWNLOAD_DIR}/perl/portableshell.bat)
-		set(MINGW_HOST x86_64-w64-mingw32)
-	else()
-		set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw32)
-		set(MINGW_SHELL ming32sh.cmd)
-		set(PERL_SHELL ${DOWNLOAD_DIR}/perl32/portableshell.bat)
-		set(MINGW_HOST i686-w64-mingw32)
-	endif()
-
-	set(CONFIGURE_ENV
-		cd ${MINGW_PATH} &&
-		call ${MINGW_SHELL} &&
-		call ${PERL_SHELL} &&
-		set path &&
-		set CFLAGS=-g &&
-		set LDFLAGS=-Wl,--as-needed -static-libgcc
-	)
-
-	set(CONFIGURE_ENV_NO_PERL
-		cd ${MINGW_PATH} &&
-		call ${MINGW_SHELL} &&
-		set path &&
-		set CFLAGS=-g &&
-		set LDFLAGS=-Wl,--as-needed -static-libgcc
-	)
-
-	set(CONFIGURE_COMMAND sh ./configure)
-	set(CONFIGURE_COMMAND_NO_TARGET ${CONFIGURE_COMMAND})
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/patch.exe)
+  else()
+    set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/patch.exe)
+  endif()
+  set(LIBEXT ".lib")
+  set(LIBPREFIX "")
+
+  # For OIIO and OSL
+  set(COMMON_DEFINES /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS)
+
+  if(MSVC_VERSION GREATER 1909)
+    set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings.
+  endif()
+  set(COMMON_MSVC_FLAGS "${COMMON_MSVC_FLAGS} /bigobj")
+  if(WITH_OPTIMIZED_DEBUG)
+    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  else()
+    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  endif()
+  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MT ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MT ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MT ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+
+  if(WITH_OPTIMIZED_DEBUG)
+    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  else()
+    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /MTd  ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  endif()
+  set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MT /${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MT ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+  set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+
+  set(PLATFORM_FLAGS)
+  set(PLATFORM_CXX_FLAGS)
+  set(PLATFORM_CMAKE_FLAGS)
+
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw64)
+    set(MINGW_SHELL ming64sh.cmd)
+    set(PERL_SHELL ${DOWNLOAD_DIR}/perl/portableshell.bat)
+    set(MINGW_HOST x86_64-w64-mingw32)
+  else()
+    set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw32)
+    set(MINGW_SHELL ming32sh.cmd)
+    set(PERL_SHELL ${DOWNLOAD_DIR}/perl32/portableshell.bat)
+    set(MINGW_HOST i686-w64-mingw32)
+  endif()
+
+  set(CONFIGURE_ENV
+    cd ${MINGW_PATH} &&
+    call ${MINGW_SHELL} &&
+    call ${PERL_SHELL} &&
+    set path &&
+    set CFLAGS=-g &&
+    set LDFLAGS=-Wl,--as-needed -static-libgcc
+  )
+
+  set(CONFIGURE_ENV_NO_PERL
+    cd ${MINGW_PATH} &&
+    call ${MINGW_SHELL} &&
+    set path &&
+    set CFLAGS=-g &&
+    set LDFLAGS=-Wl,--as-needed -static-libgcc
+  )
+
+  set(CONFIGURE_COMMAND sh ./configure)
+  set(CONFIGURE_COMMAND_NO_TARGET ${CONFIGURE_COMMAND})
 else()
-	set(PATCH_CMD patch)
-	set(LIBEXT ".a")
-	set(LIBPREFIX "lib")
-
-	if(APPLE)
-		# Let's get the current Xcode dir, to support xcode-select
-		execute_process(
-			COMMAND xcode-select --print-path
-			OUTPUT_VARIABLE XCODE_DEV_PATH OUTPUT_STRIP_TRAILING_WHITESPACE
-		)
-		set(OSX_ARCHITECTURES x86_64)
-		set(OSX_DEPLOYMENT_TARGET 10.9)
-		set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
-
-		set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
-		set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++")
-		set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
-		set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin13.0.0) # OS X 10.9
-		set(PLATFORM_CMAKE_FLAGS
-			-DCMAKE_OSX_ARCHITECTURES:STRING=${OSX_ARCHITECTURES}
-			-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}
-			-DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
-		)
-	else()
-		set(PLATFORM_CFLAGS "-fPIC")
-		set(PLATFORM_CXXFLAGS "-std=c++11 -fPIC")
-		set(PLATFORM_LDFLAGS)
-		set(PLATFORM_BUILD_TARGET)
-		set(PLATFORM_CMAKE_FLAGS -DCMAKE_INSTALL_LIBDIR=lib)
-	endif()
-
-	if(WITH_OPTIMIZED_DEBUG)
-		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-O2 -DNDEBUG ${PLATFORM_CFLAGS}")
-	else()
-		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-g ${PLATFORM_CFLAGS}")
-	endif()
-	set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG ${PLATFORM_CFLAGS}")
-	set(BLENDER_CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${PLATFORM_CFLAGS}")
-	set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CFLAGS}")
-
-	if(WITH_OPTIMIZED_DEBUG)
-		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "-O2 -DNDEBUG ${PLATFORM_CXXFLAGS}")
-	else()
-		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "-g ${PLATFORM_CXXFLAGS}")
-	endif()
-
-	set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG ${PLATFORM_CXXFLAGS}")
-	set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${PLATFORM_CXXFLAGS}")
-	set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CXXFLAGS}")
-
-	set(CONFIGURE_ENV
-		export MACOSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET} &&
-		export CFLAGS=${PLATFORM_CFLAGS} &&
-		export CXXFLAGS=${PLATFORM_CXXFLAGS} &&
-		export LDFLAGS=${PLATFORM_LDFLAGS}
-	)
-	set(CONFIGURE_ENV_NO_PERL ${CONFIGURE_ENV})
-	set(CONFIGURE_COMMAND ./configure ${PLATFORM_BUILD_TARGET})
-	set(CONFIGURE_COMMAND_NO_TARGET ./configure)
+  set(PATCH_CMD patch)
+  set(LIBEXT ".a")
+  set(LIBPREFIX "lib")
+
+  if(APPLE)
+    # Let's get the current Xcode dir, to support xcode-select
+    execute_process(
+      COMMAND xcode-select --print-path
+      OUTPUT_VARIABLE XCODE_DEV_PATH OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+    set(OSX_ARCHITECTURES x86_64)
+    set(OSX_DEPLOYMENT_TARGET 10.9)
+    set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
+
+    set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
+    set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++")
+    set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
+    set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin13.0.0) # OS X 10.9
+    set(PLATFORM_CMAKE_FLAGS
+      -DCMAKE_OSX_ARCHITECTURES:STRING=${OSX_ARCHITECTURES}
+      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}
+      -DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
+    )
+  else()
+    set(PLATFORM_CFLAGS "-fPIC")
+    set(PLATFORM_CXXFLAGS "-std=c++11 -fPIC")
+    set(PLATFORM_LDFLAGS)
+    set(PLATFORM_BUILD_TARGET)
+    set(PLATFORM_CMAKE_FLAGS -DCMAKE_INSTALL_LIBDIR=lib)
+  endif()
+
+  if(WITH_OPTIMIZED_DEBUG)
+    set(BLENDER_CMAKE_C_FLAGS_DEBUG "-O2 -DNDEBUG ${PLATFORM_CFLAGS}")
+  else()
+    set(BLENDER_CMAKE_C_FLAGS_DEBUG "-g ${PLATFORM_CFLAGS}")
+  endif()
+  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG ${PLATFORM_CFLAGS}")
+  set(BLENDER_CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${PLATFORM_CFLAGS}")
+  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CFLAGS}")
+
+  if(WITH_OPTIMIZED_DEBUG)
+    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "-O2 -DNDEBUG ${PLATFORM_CXXFLAGS}")
+  else()
+    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "-g ${PLATFORM_CXXFLAGS}")
+  endif()
+
+  set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG ${PLATFORM_CXXFLAGS}")
+  set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${PLATFORM_CXXFLAGS}")
+  set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CXXFLAGS}")
+
+  set(CONFIGURE_ENV
+    export MACOSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET} &&
+    export CFLAGS=${PLATFORM_CFLAGS} &&
+    export CXXFLAGS=${PLATFORM_CXXFLAGS} &&
+    export LDFLAGS=${PLATFORM_LDFLAGS}
+  )
+  set(CONFIGURE_ENV_NO_PERL ${CONFIGURE_ENV})
+  set(CONFIGURE_COMMAND ./configure ${PLATFORM_BUILD_TARGET})
+  set(CONFIGURE_COMMAND_NO_TARGET ./configure)
 endif()
 
 set(DEFAULT_CMAKE_FLAGS
-	-DCMAKE_BUILD_TYPE=${BUILD_MODE}
-	-DCMAKE_C_FLAGS_DEBUG=${BLENDER_CMAKE_C_FLAGS_DEBUG}
-	-DCMAKE_C_FLAGS_MINSIZEREL=${BLENDER_CMAKE_C_FLAGS_MINSIZEREL}
-	-DCMAKE_C_FLAGS_RELEASE=${BLENDER_CMAKE_C_FLAGS_RELEASE}
-	-DCMAKE_C_FLAGS_RELWITHDEBINFO=${BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO}
-	-DCMAKE_CXX_FLAGS_DEBUG=${BLENDER_CMAKE_CXX_FLAGS_DEBUG}
-	-DCMAKE_CXX_FLAGS_MINSIZEREL=${BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL}
-	-DCMAKE_CXX_FLAGS_RELEASE=${BLENDER_CMAKE_CXX_FLAGS_RELEASE}
-	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
-	${PLATFORM_CMAKE_FLAGS}
+  -DCMAKE_BUILD_TYPE=${BUILD_MODE}
+  -DCMAKE_C_FLAGS_DEBUG=${BLENDER_CMAKE_C_FLAGS_DEBUG}
+  -DCMAKE_C_FLAGS_MINSIZEREL=${BLENDER_CMAKE_C_FLAGS_MINSIZEREL}
+  -DCMAKE_C_FLAGS_RELEASE=${BLENDER_CMAKE_C_FLAGS_RELEASE}
+  -DCMAKE_C_FLAGS_RELWITHDEBINFO=${BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO}
+  -DCMAKE_CXX_FLAGS_DEBUG=${BLENDER_CMAKE_CXX_FLAGS_DEBUG}
+  -DCMAKE_CXX_FLAGS_MINSIZEREL=${BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL}
+  -DCMAKE_CXX_FLAGS_RELEASE=${BLENDER_CMAKE_CXX_FLAGS_RELEASE}
+  -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
+  ${PLATFORM_CMAKE_FLAGS}
 )
 
 if(WIN32)
-	#we need both flavors to build the thumbnail dlls
-	if(MSVC12)
-		set(GENERATOR_32 "Visual Studio 12 2013")
-		set(GENERATOR_64 "Visual Studio 12 2013 Win64")
-	elseif(MSVC14)
-		set(GENERATOR_32 "Visual Studio 14 2015")
-		set(GENERATOR_64 "Visual Studio 14 2015 Win64")
-	endif()
+  #we need both flavors to build the thumbnail dlls
+  if(MSVC12)
+    set(GENERATOR_32 "Visual Studio 12 2013")
+    set(GENERATOR_64 "Visual Studio 12 2013 Win64")
+  elseif(MSVC14)
+    set(GENERATOR_32 "Visual Studio 14 2015")
+    set(GENERATOR_64 "Visual Studio 14 2015 Win64")
+  endif()
 endif()
 
 
 if(WIN32)
-	if(BUILD_MODE STREQUAL Debug)
-		set(ZLIB_LIBRARY zlibstaticd${LIBEXT})
-	else()
-		set(ZLIB_LIBRARY zlibstatic${LIBEXT})
-	endif()
+  if(BUILD_MODE STREQUAL Debug)
+    set(ZLIB_LIBRARY zlibstaticd${LIBEXT})
+  else()
+    set(ZLIB_LIBRARY zlibstatic${LIBEXT})
+  endif()
 else()
-	set(ZLIB_LIBRARY libz${LIBEXT})
+  set(ZLIB_LIBRARY libz${LIBEXT})
 endif()
 
 if(MSVC)
-	set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+  set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 endif()
 
 set(CMAKE_INSTALL_MESSAGE LAZY)
diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake
index 795892f29e2..7479a0f1efb 100644
--- a/build_files/build_environment/cmake/osl.cmake
+++ b/build_files/build_environment/cmake/osl.cmake
@@ -17,116 +17,116 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-	set(OSL_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
-	set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DFLEX_EXTRA_OPTIONS="--wincompat" -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
-	set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/libpng16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-		set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=0)
-	else()
-		set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
-	endif()
-	SET(OSL_PLATFORM_FLAGS -DLINKSTATIC=ON)
+  set(OSL_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
+  set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DFLEX_EXTRA_OPTIONS="--wincompat" -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
+  set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/libpng16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+    set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=0)
+  else()
+    set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
+  endif()
+  SET(OSL_PLATFORM_FLAGS -DLINKSTATIC=ON)
 else()
-	set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
-	set(OSL_FLEX_BISON)
-	set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
-	SET(OSL_PLATFORM_FLAGS)
+  set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
+  set(OSL_FLEX_BISON)
+  set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
+  SET(OSL_PLATFORM_FLAGS)
 endif()
 
 set(OSL_ILMBASE_CUSTOM_LIBRARIES "${LIBDIR}/ilmbase/lib/Imath${ILMBASE_VERSION_POSTFIX}.lib^^${LIBDIR}/ilmbase/lib/Half{ILMBASE_VERSION_POSTFIX}.lib^^${LIBDIR}/ilmbase/lib/IlmThread${ILMBASE_VERSION_POSTFIX}.lib^^${LIBDIR}/ilmbase/lib/Iex${ILMBASE_VERSION_POSTFIX}.lib")
 set(OSL_LLVM_LIBRARY "${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAnalysis${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAsmParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMBitReader${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMBitWriter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMCodeGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMCore${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMDebugInfo${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMExecutionEngine${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInstCombine${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInstrumentation${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInterpreter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMJIT${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMLinker${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMC${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCDisassembler${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCJIT${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMObject${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMRuntimeDyld${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMScalarOpts${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMSelectionDAG${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMSupport${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTableGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTarget${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTransformUtils${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMVectorize${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86AsmParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86AsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86CodeGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Desc${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Disassembler${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Info${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Utils${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMipa${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMipo${LIBEXT}")
 
 set(OSL_EXTRA_ARGS
-	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-	-DBoost_USE_MULTITHREADED=ON
-	-DBoost_USE_STATIC_LIBS=ON
-	-DBoost_USE_STATIC_RUNTIME=ON
-	-DBOOST_ROOT=${LIBDIR}/boost
-	-DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
-	-DBoost_NO_SYSTEM_PATHS=ON
-	-DLLVM_DIRECTORY=${LIBDIR}/llvm
-	-DLLVM_INCLUDES=${LIBDIR}/llvm/include
-	-DLLVM_LIB_DIR=${LIBDIR}/llvm/lib
-	-DLLVM_VERSION=3.4
-	-DLLVM_LIBRARY=${OSL_LLVM_LIBRARY}
-	-DOPENEXR_HOME=${LIBDIR}/openexr/
-	-DILMBASE_HOME=${LIBDIR}/ilmbase/
-	-DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
-	-DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
-	-DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-	-DOSL_BUILD_TESTS=OFF
-	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-	-DOPENIMAGEIOHOME=${LIBDIR}/openimageio/
-	-DOPENIMAGEIO_LIBRARY=${OSL_OPENIMAGEIO_LIBRARY}
-	-DOPENIMAGEIO_INCLUDES=${LIBDIR}/openimageio/include
-	${OSL_FLEX_BISON}
-	-DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
-	-DBUILDSTATIC=ON
-	${OSL_PLATFORM_FLAGS}
-	-DOSL_BUILD_PLUGINS=Off
-	-DSTOP_ON_WARNING=OFF
-	-DUSE_LLVM_BITCODE=OFF
-	-DUSE_PARTIO=OFF
-	${OSL_SIMD_FLAGS}
-	-DPARTIO_LIBRARIES=
+  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+  -DBoost_USE_MULTITHREADED=ON
+  -DBoost_USE_STATIC_LIBS=ON
+  -DBoost_USE_STATIC_RUNTIME=ON
+  -DBOOST_ROOT=${LIBDIR}/boost
+  -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
+  -DBoost_NO_SYSTEM_PATHS=ON
+  -DLLVM_DIRECTORY=${LIBDIR}/llvm
+  -DLLVM_INCLUDES=${LIBDIR}/llvm/include
+  -DLLVM_LIB_DIR=${LIBDIR}/llvm/lib
+  -DLLVM_VERSION=3.4
+  -DLLVM_LIBRARY=${OSL_LLVM_LIBRARY}
+  -DOPENEXR_HOME=${LIBDIR}/openexr/
+  -DILMBASE_HOME=${LIBDIR}/ilmbase/
+  -DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
+  -DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
+  -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+  -DOSL_BUILD_TESTS=OFF
+  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+  -DOPENIMAGEIOHOME=${LIBDIR}/openimageio/
+  -DOPENIMAGEIO_LIBRARY=${OSL_OPENIMAGEIO_LIBRARY}
+  -DOPENIMAGEIO_INCLUDES=${LIBDIR}/openimageio/include
+  ${OSL_FLEX_BISON}
+  -DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
+  -DBUILDSTATIC=ON
+  ${OSL_PLATFORM_FLAGS}
+  -DOSL_BUILD_PLUGINS=Off
+  -DSTOP_ON_WARNING=OFF
+  -DUSE_LLVM_BITCODE=OFF
+  -DUSE_PARTIO=OFF
+  ${OSL_SIMD_FLAGS}
+  -DPARTIO_LIBRARIES=
 )
 
 if(WIN32)
-	set(OSL_EXTRA_ARGS
-		${OSL_EXTRA_ARGS}
-		-DPUGIXML_HOME=${LIBDIR}/pugixml
-	)
+  set(OSL_EXTRA_ARGS
+    ${OSL_EXTRA_ARGS}
+    -DPUGIXML_HOME=${LIBDIR}/pugixml
+  )
 elseif(APPLE)
-	# Make symbol hiding consistent with OIIO which defaults to OFF,
-	# avoids linker warnings on macOS
-	set(OSL_EXTRA_ARGS
-		${OSL_EXTRA_ARGS}
-		-DHIDE_SYMBOLS=OFF
-	)
+  # Make symbol hiding consistent with OIIO which defaults to OFF,
+  # avoids linker warnings on macOS
+  set(OSL_EXTRA_ARGS
+    ${OSL_EXTRA_ARGS}
+    -DHIDE_SYMBOLS=OFF
+  )
 endif()
 
 ExternalProject_Add(external_osl
-	URL ${OSL_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	LIST_SEPARATOR ^^
-	URL_HASH MD5=${OSL_HASH}
-	PREFIX ${BUILD_DIR}/osl
-	PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/osl
+  URL ${OSL_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  LIST_SEPARATOR ^^
+  URL_HASH MD5=${OSL_HASH}
+  PREFIX ${BUILD_DIR}/osl
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/osl
 )
 
 add_dependencies(
-	external_osl
-	external_boost
-	ll
-	external_clang
-	external_ilmbase
-	external_openexr
-	external_zlib
-	external_flexbison
-	external_openimageio
-	external_pugixml
+  external_osl
+  external_boost
+  ll
+  external_clang
+  external_ilmbase
+  external_openexr
+  external_zlib
+  external_flexbison
+  external_openimageio
+  external_pugixml
 )
 
 if(WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_osl after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/osl/ ${HARVEST_TARGET}/osl
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_osl after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslcomp.lib ${HARVEST_TARGET}/osl/lib/oslcomp_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslexec.lib ${HARVEST_TARGET}/osl/lib/oslexec_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslquery.lib ${HARVEST_TARGET}/osl/lib/oslquery_d.lib
-			DEPENDEES install
-		)
-	endif()
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_osl after_install
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/osl/ ${HARVEST_TARGET}/osl
+      DEPENDEES install
+    )
+  endif()
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(external_osl after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslcomp.lib ${HARVEST_TARGET}/osl/lib/oslcomp_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslexec.lib ${HARVEST_TARGET}/osl/lib/oslexec_d.lib
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslquery.lib ${HARVEST_TARGET}/osl/lib/oslquery_d.lib
+      DEPENDEES install
+    )
+  endif()
 endif()
diff --git a/build_files/build_environment/cmake/png.cmake b/build_files/build_environment/cmake/png.cmake
index 6e51fb9ebe4..2bf32b77ce9 100644
--- a/build_files/build_environment/cmake/png.cmake
+++ b/build_files/build_environment/cmake/png.cmake
@@ -17,28 +17,28 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(PNG_EXTRA_ARGS
-	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-	-DPNG_STATIC=ON
+  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+  -DPNG_STATIC=ON
 )
 
 ExternalProject_Add(external_png
-	URL ${PNG_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${PNG_HASH}
-	PREFIX ${BUILD_DIR}/png
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/png ${DEFAULT_CMAKE_FLAGS} ${PNG_EXTRA_ARGS}
-	INSTALL_DIR	${LIBDIR}/png
+  URL ${PNG_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${PNG_HASH}
+  PREFIX ${BUILD_DIR}/png
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/png ${DEFAULT_CMAKE_FLAGS} ${PNG_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/png
 )
 
 add_dependencies(
-	external_png
-	external_zlib
+  external_png
+  external_zlib
 )
 
 if(WIN32 AND BUILD_MODE STREQUAL Debug)
-	ExternalProject_Add_Step(external_png after_install
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_staticd${LIBEXT} ${LIBDIR}/png/lib/libpng16${LIBEXT}
-		DEPENDEES install
-	)
+  ExternalProject_Add_Step(external_png after_install
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_staticd${LIBEXT} ${LIBDIR}/png/lib/libpng16${LIBEXT}
+    DEPENDEES install
+  )
 endif()
diff --git a/build_files/build_environment/cmake/pthreads.cmake b/build_files/build_environment/cmake/pthreads.cmake
index 8d605973fa5..c5c331117fc 100644
--- a/build_files/build_environment/cmake/pthreads.cmake
+++ b/build_files/build_environment/cmake/pthreads.cmake
@@ -18,36 +18,36 @@
 
 if(WIN32)
 
-		if(MSVC14) # vs2015 has timespec
-			set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H /D_TIMESPEC_DEFINED ")
-		else() # everything before doesn't
-			set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H ")
-		endif()
+    if(MSVC14) # vs2015 has timespec
+      set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H /D_TIMESPEC_DEFINED ")
+    else() # everything before doesn't
+      set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H ")
+    endif()
 
-		set(PTHREADS_BUILD cd ${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC-static /e CPPFLAGS=${PTHREAD_CPPFLAGS} /e XLIBS=/NODEFAULTLIB:msvcr)
+    set(PTHREADS_BUILD cd ${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC-static /e CPPFLAGS=${PTHREAD_CPPFLAGS} /e XLIBS=/NODEFAULTLIB:msvcr)
 
-		ExternalProject_Add(external_pthreads
-			URL ${PTHREADS_URI}
-			DOWNLOAD_DIR ${DOWNLOAD_DIR}
-			URL_HASH MD5=${PTHREADS_HASH}
-			PREFIX ${BUILD_DIR}/pthreads
-			CONFIGURE_COMMAND echo .
-			BUILD_COMMAND ${PTHREADS_BUILD}
-			INSTALL_COMMAND COMMAND
-				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/libpthreadVC3${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC3${LIBEXT} &&
-				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthread.h ${LIBDIR}/pthreads/inc/pthread.h &&
-				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/sched.h ${LIBDIR}/pthreads/inc/sched.h &&
-				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h ${LIBDIR}/pthreads/inc/semaphore.h &&
-				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/_ptw32.h ${LIBDIR}/pthreads/inc/_ptw32.h
-			INSTALL_DIR ${LIBDIR}/pthreads
-		)
+    ExternalProject_Add(external_pthreads
+      URL ${PTHREADS_URI}
+      DOWNLOAD_DIR ${DOWNLOAD_DIR}
+      URL_HASH MD5=${PTHREADS_HASH}
+      PREFIX ${BUILD_DIR}/pthreads
+      CONFIGURE_COMMAND echo .
+      BUILD_COMMAND ${PTHREADS_BUILD}
+      INSTALL_COMMAND COMMAND
+        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/libpthreadVC3${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC3${LIBEXT} &&
+        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthread.h ${LIBDIR}/pthreads/inc/pthread.h &&
+        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/sched.h ${LIBDIR}/pthreads/inc/sched.h &&
+        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h ${LIBDIR}/pthreads/inc/semaphore.h &&
+        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/_ptw32.h ${LIBDIR}/pthreads/inc/_ptw32.h
+      INSTALL_DIR ${LIBDIR}/pthreads
+    )
 
-		if(BUILD_MODE STREQUAL Release)
-			ExternalProject_Add_Step(external_pthreads after_install
-				COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/inc/ ${HARVEST_TARGET}/pthreads/include/
-				COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib
-				DEPENDEES install
-			)
-		endif()
+    if(BUILD_MODE STREQUAL Release)
+      ExternalProject_Add_Step(external_pthreads after_install
+        COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/inc/ ${HARVEST_TARGET}/pthreads/include/
+        COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib
+        DEPENDEES install
+      )
+    endif()
 
 endif()
diff --git a/build_files/build_environment/cmake/pugixml.cmake b/build_files/build_environment/cmake/pugixml.cmake
index fe5a77efa33..8804ae74836 100644
--- a/build_files/build_environment/cmake/pugixml.cmake
+++ b/build_files/build_environment/cmake/pugixml.cmake
@@ -20,24 +20,24 @@ set(PUGIXML_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_pugixml
-	URL ${PUGIXML_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${PUGIXML_HASH}
-	PREFIX ${BUILD_DIR}/pugixml
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pugixml ${DEFAULT_CMAKE_FLAGS} ${PUGIXML_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/pugixml
+  URL ${PUGIXML_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${PUGIXML_HASH}
+  PREFIX ${BUILD_DIR}/pugixml
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pugixml ${DEFAULT_CMAKE_FLAGS} ${PUGIXML_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/pugixml
 )
 if(WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_pugixml after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml.lib
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_pugixml after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml_d.lib
-			DEPENDEES install
-		)
-	endif()	
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_pugixml after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml.lib
+      DEPENDEES install
+    )
+  endif()
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(external_pugixml after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml_d.lib
+      DEPENDEES install
+    )
+  endif() 
 endif()
\ No newline at end of file
diff --git a/build_files/build_environment/cmake/python.cmake b/build_files/build_environment/cmake/python.cmake
index 29eb99288e9..cb3aefa3a9d 100644
--- a/build_files/build_environment/cmake/python.cmake
+++ b/build_files/build_environment/cmake/python.cmake
@@ -18,164 +18,164 @@
 
 set(PYTHON_POSTFIX)
 if(BUILD_MODE STREQUAL Debug)
-	set(PYTHON_POSTFIX _d)
+  set(PYTHON_POSTFIX _d)
 endif()
 
 if(WIN32)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(SSL_POSTFIX -x64)
-	else()
-		set(SSL_POSTFIX)
-	endif()
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(SSL_POSTFIX -x64)
+  else()
+    set(SSL_POSTFIX)
+  endif()
 
-	set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe)
+  set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe)
 
-	macro(cmake_to_dos_path MsysPath ResultingPath)
-		string(REPLACE "/" "\\" ${ResultingPath} "${MsysPath}")
-	endmacro()
+  macro(cmake_to_dos_path MsysPath ResultingPath)
+    string(REPLACE "/" "\\" ${ResultingPath} "${MsysPath}")
+  endmacro()
 
-	set(PYTHON_EXTERNALS_FOLDER ${BUILD_DIR}/python/src/external_python/externals)
-	set(DOWNLOADS_EXTERNALS_FOLDER ${DOWNLOAD_DIR}/externals)
+  set(PYTHON_EXTERNALS_FOLDER ${BUILD_DIR}/python/src/external_python/externals)
+  set(DOWNLOADS_EXTERNALS_FOLDER ${DOWNLOAD_DIR}/externals)
 
-	cmake_to_dos_path(${PYTHON_EXTERNALS_FOLDER} PYTHON_EXTERNALS_FOLDER_DOS)
-	cmake_to_dos_path(${DOWNLOADS_EXTERNALS_FOLDER} DOWNLOADS_EXTERNALS_FOLDER_DOS)
+  cmake_to_dos_path(${PYTHON_EXTERNALS_FOLDER} PYTHON_EXTERNALS_FOLDER_DOS)
+  cmake_to_dos_path(${DOWNLOADS_EXTERNALS_FOLDER} DOWNLOADS_EXTERNALS_FOLDER_DOS)
 
-	message("Python externals = ${PYTHON_EXTERNALS_FOLDER}")
-	message("Python externals_dos = ${PYTHON_EXTERNALS_FOLDER_DOS}")
-	message("Python DOWNLOADS_EXTERNALS_FOLDER = ${DOWNLOADS_EXTERNALS_FOLDER}")
-	message("Python DOWNLOADS_EXTERNALS_FOLDER_DOS = ${DOWNLOADS_EXTERNALS_FOLDER_DOS}")
+  message("Python externals = ${PYTHON_EXTERNALS_FOLDER}")
+  message("Python externals_dos = ${PYTHON_EXTERNALS_FOLDER_DOS}")
+  message("Python DOWNLOADS_EXTERNALS_FOLDER = ${DOWNLOADS_EXTERNALS_FOLDER}")
+  message("Python DOWNLOADS_EXTERNALS_FOLDER_DOS = ${DOWNLOADS_EXTERNALS_FOLDER_DOS}")
 
-	ExternalProject_Add(external_python
-		URL ${PYTHON_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH MD5=${PYTHON_HASH}
-		PREFIX ${BUILD_DIR}/python
-		PATCH_COMMAND
-			echo mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
-			mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}"
-		CONFIGURE_COMMAND ""
-		BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -c ${BUILD_MODE}
-		INSTALL_COMMAND COMMAND
-			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll &&
-			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb &&
-			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib &&
-			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.exp ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.exp &&
-			${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${LIBDIR}/python/include/Python${PYTHON_SHORT_VERSION} &&
-			${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${LIBDIR}/python/include/Python${PYTHON_SHORT_VERSION}/pyconfig.h
-	)
-	message("PythinRedist = ${BUILD_DIR}/python/src/external_python/redist")
-	message("POutput = ${PYTHON_OUTPUTDIR}")
+  ExternalProject_Add(external_python
+    URL ${PYTHON_URI}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH MD5=${PYTHON_HASH}
+    PREFIX ${BUILD_DIR}/python
+    PATCH_COMMAND
+      echo mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
+      mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}"
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -c ${BUILD_MODE}
+    INSTALL_COMMAND COMMAND
+      ${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll &&
+      ${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb &&
+      ${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib &&
+      ${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.exp ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.exp &&
+      ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${LIBDIR}/python/include/Python${PYTHON_SHORT_VERSION} &&
+      ${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${LIBDIR}/python/include/Python${PYTHON_SHORT_VERSION}/pyconfig.h
+  )
+  message("PythinRedist = ${BUILD_DIR}/python/src/external_python/redist")
+  message("POutput = ${PYTHON_OUTPUTDIR}")
 else()
-	if(APPLE)
-		# disable functions that can be in 10.13 sdk but aren't available on 10.9 target
-		set(PYTHON_FUNC_CONFIGS
-		  export ac_cv_func_futimens=no &&
-		  export ac_cv_func_utimensat=no &&
-		  export ac_cv_func_basename_r=no &&
-		  export ac_cv_func_clock_getres=no &&
-		  export ac_cv_func_clock_gettime=no &&
-		  export ac_cv_func_clock_settime=no &&
-		  export ac_cv_func_dirname_r=no &&
-		  export ac_cv_func_getentropy=no &&
-		  export ac_cv_func_mkostemp=no &&
-		  export ac_cv_func_mkostemps=no &&
-		  export ac_cv_func_timingsafe_bcmp=no)
-		set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && ${PYTHON_FUNC_CONFIGS})
-		set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
-	else()
-		set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
-		set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
-	endif()
+  if(APPLE)
+    # disable functions that can be in 10.13 sdk but aren't available on 10.9 target
+    set(PYTHON_FUNC_CONFIGS
+      export ac_cv_func_futimens=no &&
+      export ac_cv_func_utimensat=no &&
+      export ac_cv_func_basename_r=no &&
+      export ac_cv_func_clock_getres=no &&
+      export ac_cv_func_clock_gettime=no &&
+      export ac_cv_func_clock_settime=no &&
+      export ac_cv_func_dirname_r=no &&
+      export ac_cv_func_getentropy=no &&
+      export ac_cv_func_mkostemp=no &&
+      export ac_cv_func_mkostemps=no &&
+      export ac_cv_func_timingsafe_bcmp=no)
+    set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && ${PYTHON_FUNC_CONFIGS})
+    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
+  else()
+    set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
+    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
+  endif()
 
-	set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
-	set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include")
-	set(PYTHON_LDFLAGS "-L${LIBDIR}/ffi/lib -L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib")
-	set(PYTHON_CONFIGURE_EXTRA_ENV
-		export CFLAGS=${PYTHON_CFLAGS} &&
-		export CPPFLAGS=${PYTHON_CFLAGS} &&
-		export LDFLAGS=${PYTHON_LDFLAGS} &&
-		export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig)
-	set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)
+  set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
+  set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include")
+  set(PYTHON_LDFLAGS "-L${LIBDIR}/ffi/lib -L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib")
+  set(PYTHON_CONFIGURE_EXTRA_ENV
+    export CFLAGS=${PYTHON_CFLAGS} &&
+    export CPPFLAGS=${PYTHON_CFLAGS} &&
+    export LDFLAGS=${PYTHON_LDFLAGS} &&
+    export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig)
+  set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)
 
-	ExternalProject_Add(external_python
-		URL ${PYTHON_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH MD5=${PYTHON_HASH}
-		PREFIX ${BUILD_DIR}/python
-		PATCH_COMMAND ${PYTHON_PATCH}
-		CONFIGURE_COMMAND ${PYTHON_CONFIGURE_ENV} && ${PYTHON_CONFIGURE_EXTRA_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/python ${PYTHON_CONFIGURE_EXTRA_ARGS}
-		BUILD_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make -j${MAKE_THREADS}
-		INSTALL_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make install
-		INSTALL_DIR ${LIBDIR}/python)
+  ExternalProject_Add(external_python
+    URL ${PYTHON_URI}
+    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+    URL_HASH MD5=${PYTHON_HASH}
+    PREFIX ${BUILD_DIR}/python
+    PATCH_COMMAND ${PYTHON_PATCH}
+    CONFIGURE_COMMAND ${PYTHON_CONFIGURE_ENV} && ${PYTHON_CONFIGURE_EXTRA_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/python ${PYTHON_CONFIGURE_EXTRA_ARGS}
+    BUILD_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make -j${MAKE_THREADS}
+    INSTALL_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make install
+    INSTALL_DIR ${LIBDIR}/python)
 
-	add_custom_target(Make_Python_Environment ALL DEPENDS external_python)
+  add_custom_target(Make_Python_Environment ALL DEPENDS external_python)
 endif()
 
 if(MSVC)
-	add_custom_command(
-		OUTPUT ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz
-		OUTPUT ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/lib ${BUILD_DIR}/python/src/external_python/redist/lib
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_asyncio${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_asyncio${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_bz2${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_bz2${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_contextvars${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_contextvars${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ctypes${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ctypes_test${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes_test${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_decimal${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_decimal${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_distutils_findvs${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_distutils_findvs${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_elementtree${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_elementtree${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_hashlib${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_hashlib${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_lzma${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_lzma${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_msi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_msi${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_multiprocessing${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_multiprocessing${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_overlapped${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_overlapped${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_queue${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_queue${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_socket${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_socket${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_sqlite3${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_sqlite3${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ssl${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ssl${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testbuffer${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testbuffer${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testcapi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testcapi${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testimportmultiple${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testimportmultiple${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testmultiphase${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testmultiphase${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/pyexpat${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/pyexpat${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/select${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/select${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/unicodedata${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/unicodedata${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/winsound${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/winsound${PYTHON_POSTFIX}.pyd
-		#xxlimited is an example extension module, we don't need to ship it and debug doesn't build it
-		#leaving it commented out, so I won't get confused again with the next update.
-		#COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/xxlimited${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/xxlimited${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/libssl-1_1${SSL_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/libssl-1_1${SSL_POSTFIX}.dll
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/libcrypto-1_1${SSL_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/libcrypto-1_1${SSL_POSTFIX}.dll
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/sqlite3${PYTHON_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/sqlite3${PYTHON_POSTFIX}.dll
-		COMMAND ${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/python/src/external_python/redist" ${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz" "."
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz
-	)
+  add_custom_command(
+    OUTPUT ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz
+    OUTPUT ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/lib ${BUILD_DIR}/python/src/external_python/redist/lib
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_asyncio${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_asyncio${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_bz2${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_bz2${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_contextvars${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_contextvars${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ctypes${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ctypes_test${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes_test${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_decimal${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_decimal${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_distutils_findvs${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_distutils_findvs${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_elementtree${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_elementtree${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_hashlib${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_hashlib${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_lzma${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_lzma${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_msi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_msi${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_multiprocessing${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_multiprocessing${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_overlapped${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_overlapped${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_queue${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_queue${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_socket${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_socket${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_sqlite3${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_sqlite3${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ssl${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ssl${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testbuffer${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testbuffer${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testcapi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testcapi${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testimportmultiple${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testimportmultiple${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testmultiphase${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testmultiphase${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/pyexpat${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/pyexpat${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/select${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/select${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/unicodedata${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/unicodedata${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/winsound${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/winsound${PYTHON_POSTFIX}.pyd
+    #xxlimited is an example extension module, we don't need to ship it and debug doesn't build it
+    #leaving it commented out, so I won't get confused again with the next update.
+    #COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/xxlimited${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/xxlimited${PYTHON_POSTFIX}.pyd
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/libssl-1_1${SSL_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/libssl-1_1${SSL_POSTFIX}.dll
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/libcrypto-1_1${SSL_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/libcrypto-1_1${SSL_POSTFIX}.dll
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/sqlite3${PYTHON_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/sqlite3${PYTHON_POSTFIX}.dll
+    COMMAND ${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/python/src/external_python/redist" ${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz" "."
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz
+  )
 
-	add_custom_target(Package_Python ALL DEPENDS external_python ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe)
+  add_custom_target(Package_Python ALL DEPENDS external_python ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe)
 
-	add_custom_command(OUTPUT ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
-		COMMAND	${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/redist ${BUILD_DIR}/python/src/external_python/run
-		COMMAND	${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/run/include
-		COMMAND	${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${BUILD_DIR}/python/src/external_python/run/include/pyconfig.h
-		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll
-		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib" ${BUILD_DIR}/python/src/external_python/run/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib  #missing postfix on purpose, distutils is not expecting it
-		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib" ${BUILD_DIR}/python/src/external_python/run/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib  #other things like numpy still want it though.
-		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
-		COMMAND	${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe -m ensurepip --upgrade
-	)
-	add_custom_target(Make_Python_Environment ALL DEPENDS ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe Package_Python)
+  add_custom_command(OUTPUT ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/redist ${BUILD_DIR}/python/src/external_python/run
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/run/include
+    COMMAND ${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${BUILD_DIR}/python/src/external_python/run/include/pyconfig.h
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib" ${BUILD_DIR}/python/src/external_python/run/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib  #missing postfix on purpose, distutils is not expecting it
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib" ${BUILD_DIR}/python/src/external_python/run/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib  #other things like numpy still want it though.
+    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
+    COMMAND ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe -m ensurepip --upgrade
+  )
+  add_custom_target(Make_Python_Environment ALL DEPENDS ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe Package_Python)
 endif()
 
 if(UNIX)
-	add_dependencies(
-		external_python
-		external_bzip2
-		external_ffi
-		external_lzma
-		external_ssl
-		external_sqlite
-		external_zlib
-	)
+  add_dependencies(
+    external_python
+    external_bzip2
+    external_ffi
+    external_lzma
+    external_ssl
+    external_sqlite
+    external_zlib
+  )
 endif()
diff --git a/build_files/build_environment/cmake/python_site_packages.cmake b/build_files/build_environment/cmake/python_site_packages.cmake
index 0619bc3f887..3a2901cadb7 100644
--- a/build_files/build_environment/cmake/python_site_packages.cmake
+++ b/build_files/build_environment/cmake/python_site_packages.cmake
@@ -16,26 +16,26 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 if(WIN32)
-	set(HARVEST_CMD cmd /C FOR /d /r ${BUILD_DIR}/python/src/external_python/run/lib/site-packages %d IN (__pycache__) DO @IF EXIST "%d" rd /s /q "%d" &&
-		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/idna ${HARVEST_TARGET}/Release/site-packages/idna &&
-		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/chardet ${HARVEST_TARGET}/Release/site-packages/chardet &&
-		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/urllib3 ${HARVEST_TARGET}/Release/site-packages/urllib3 &&
-		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/certifi ${HARVEST_TARGET}/Release/site-packages/certifi &&
-		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/requests ${HARVEST_TARGET}/Release/site-packages/requests
-	)
+  set(HARVEST_CMD cmd /C FOR /d /r ${BUILD_DIR}/python/src/external_python/run/lib/site-packages %d IN (__pycache__) DO @IF EXIST "%d" rd /s /q "%d" &&
+    ${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/idna ${HARVEST_TARGET}/Release/site-packages/idna &&
+    ${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/chardet ${HARVEST_TARGET}/Release/site-packages/chardet &&
+    ${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/urllib3 ${HARVEST_TARGET}/Release/site-packages/urllib3 &&
+    ${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/certifi ${HARVEST_TARGET}/Release/site-packages/certifi &&
+    ${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/requests ${HARVEST_TARGET}/Release/site-packages/requests
+  )
 else()
-	set(HARVEST_CMD echo .)
+  set(HARVEST_CMD echo .)
 endif()
 
 ExternalProject_Add(external_python_site_packages
-	DOWNLOAD_COMMAND ""
-	CONFIGURE_COMMAND ""
-	BUILD_COMMAND ""
-	PREFIX ${BUILD_DIR}/site_packages
-	INSTALL_COMMAND ${PYTHON_BINARY} -m pip install idna==${IDNA_VERSION} chardet==${CHARDET_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all: && ${HARVEST_CMD}
+  DOWNLOAD_COMMAND ""
+  CONFIGURE_COMMAND ""
+  BUILD_COMMAND ""
+  PREFIX ${BUILD_DIR}/site_packages
+  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install idna==${IDNA_VERSION} chardet==${CHARDET_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all: && ${HARVEST_CMD}
 )
 
 add_dependencies(
-	external_python_site_packages
-	Make_Python_Environment
+  external_python_site_packages
+  Make_Python_Environment
 )
diff --git a/build_files/build_environment/cmake/sdl.cmake b/build_files/build_environment/cmake/sdl.cmake
index ab81ad130e8..5dfe78601ff 100644
--- a/build_files/build_environment/cmake/sdl.cmake
+++ b/build_files/build_environment/cmake/sdl.cmake
@@ -17,33 +17,33 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-	set(SDL_EXTRA_ARGS
-		-DSDL_STATIC=Off
-	)
+  set(SDL_EXTRA_ARGS
+    -DSDL_STATIC=Off
+  )
 else()
-	set(SDL_EXTRA_ARGS
-		-DSDL_STATIC=ON
-		-DSDL_SHARED=OFF
-		-DSDL_VIDEO=OFF
-		-DSNDIO=OFF
-	)
+  set(SDL_EXTRA_ARGS
+    -DSDL_STATIC=ON
+    -DSDL_SHARED=OFF
+    -DSDL_VIDEO=OFF
+    -DSNDIO=OFF
+  )
 endif()
 
 ExternalProject_Add(external_sdl
-	URL ${SDL_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${SDL_HASH}
-	PREFIX ${BUILD_DIR}/sdl
-	PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/sdl/src/external_sdl < ${PATCH_DIR}/sdl.diff
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl ${DEFAULT_CMAKE_FLAGS} ${SDL_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/sdl
+  URL ${SDL_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${SDL_HASH}
+  PREFIX ${BUILD_DIR}/sdl
+  PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/sdl/src/external_sdl < ${PATCH_DIR}/sdl.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl ${DEFAULT_CMAKE_FLAGS} ${SDL_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/sdl
 )
 
 if(BUILD_MODE STREQUAL Release AND WIN32)
-	ExternalProject_Add_Step(external_sdl after_install
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/include/sdl2 ${HARVEST_TARGET}/sdl/include
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/lib ${HARVEST_TARGET}/sdl/lib
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib
-		DEPENDEES install
-	)
+  ExternalProject_Add_Step(external_sdl after_install
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/include/sdl2 ${HARVEST_TARGET}/sdl/include
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/lib ${HARVEST_TARGET}/sdl/lib
+    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib
+    DEPENDEES install
+  )
 endif()
diff --git a/build_files/build_environment/cmake/setup_mingw32.cmake b/build_files/build_environment/cmake/setup_mingw32.cmake
index afb44e8e88d..c9fbe301ac7 100644
--- a/build_files/build_environment/cmake/setup_mingw32.cmake
+++ b/build_files/build_environment/cmake/setup_mingw32.cmake
@@ -24,11 +24,11 @@
 
 message("LIBDIR = ${LIBDIR}")
 macro(cmake_to_msys_path MsysPath ResultingPath)
-	string(REPLACE ":" "" TmpPath "${MsysPath}")
-	string(SUBSTRING ${TmpPath} 0 1 Drive)
-	string(SUBSTRING ${TmpPath} 1 255 PathPart)
-	string(TOLOWER ${Drive} LowerDrive)
-	string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart})
+  string(REPLACE ":" "" TmpPath "${MsysPath}")
+  string(SUBSTRING ${TmpPath} 0 1 Drive)
+  string(SUBSTRING ${TmpPath} 1 255 PathPart)
+  string(TOLOWER ${Drive} LowerDrive)
+  string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart})
 endmacro()
 cmake_to_msys_path(${LIBDIR} mingw_LIBDIR)
 message("mingw_LIBDIR = ${mingw_LIBDIR}")
@@ -36,192 +36,192 @@ message("mingw_LIBDIR = ${mingw_LIBDIR}")
 message("Checking for mingw32")
 # download mingw32
 if(NOT EXISTS "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z")
-	message("Downloading mingw32")
-	file(DOWNLOAD "https://astuteinternet.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.4/threads-win32/sjlj/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z" "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z")
+  message("Downloading mingw32")
+  file(DOWNLOAD "https://astuteinternet.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.4/threads-win32/sjlj/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z" "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z")
 endif()
 
 # make mingw root directory
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-	)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+  )
 endif()
 
 # extract mingw32
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd") AND (EXISTS "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z"))
-	message("Extracting mingw32")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
-	)
+  message("Extracting mingw32")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
+  )
 endif()
 
 message("Checking for pkg-config")
 if(NOT EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
-	message("Downloading pkg-config")
-	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
+  message("Downloading pkg-config")
+  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
 endif()
 
 # extract pkgconfig
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe") AND (EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"))
-	message("Extracting pkg-config")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
-	)
+  message("Extracting pkg-config")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/
+  )
 
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe"
-	)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe"
+  )
 
 endif()
 
 message("Checking for nasm")
 if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip")
-	message("Downloading nasm")
-	file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win32/nasm-2.13.02-win32.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip")
+  message("Downloading nasm")
+  file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win32/nasm-2.13.02-win32.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip")
 endif()
 
 # extract nasm
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip"))
-	message("Extracting nasm")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip"
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
-	)
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe"
-	)
+  message("Extracting nasm")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip"
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/
+  )
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe"
+  )
 
 endif()
 SET(NASM_PATH ${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe)
 message("Checking for mingwGet")
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
-	message("Downloading mingw-get")
-	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
+  message("Downloading mingw-get")
+  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
 endif()
 
 # extract mingw_get
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"))
-	message("Extracting mingw-get")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw32/
-	)
+  message("Extracting mingw-get")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw32/
+  )
 endif()
 
 if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/make.exe"))
-	message("Installing MSYS")
-	execute_process(
-		COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-patch
-		WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw32/bin/
-	)
+  message("Installing MSYS")
+  execute_process(
+    COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-patch
+    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw32/bin/
+  )
 endif()
 
 if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/mktemp.exe"))
-	message("Installing mktemp")
-	execute_process(
-		COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-mktemp
-		WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw32/bin/
-	)
+  message("Installing mktemp")
+  execute_process(
+    COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-mktemp
+    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw32/bin/
+  )
 endif()
 
 
 message("Checking for CoreUtils")
 # download old core_utils for pr.exe (ffmpeg needs it to build)
 if(NOT EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
-	message("Downloading CoreUtils 5.97")
-	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
+  message("Downloading CoreUtils 5.97")
+  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
 endif()
 
 if((EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe"))
-	message("Installing pr from CoreUtils 5.97")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-	)
+  message("Installing pr from CoreUtils 5.97")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+  )
 
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
-	)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
+  )
 
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe"
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
-	)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe"
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
+  )
 endif()
 
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd")
-	message("Installing ming32sh.cmd")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming32sh.cmd  ${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd
-	)
+  message("Installing ming32sh.cmd")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming32sh.cmd  ${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd
+  )
 endif()
 
 message("Checking for perl")
 # download perl for libvpx
 if(NOT EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip")
-	message("Downloading perl")
-	file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-32bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip")
+  message("Downloading perl")
+  file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-32bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip")
 endif()
 
 # make perl root directory
 if(NOT EXISTS "${DOWNLOAD_DIR}/perl32")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl32
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-	)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl32
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+  )
 endif()
 
 # extract perl
 if((NOT EXISTS "${DOWNLOAD_DIR}/perl32/portable.perl") AND (EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip"))
-	message("Extracting perl")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl32
-	)
+  message("Extracting perl")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl32
+  )
 endif()
 
 # get yasm for vpx
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe")
-	message("Downloading yasm")
-	file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win32.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe")
+  message("Downloading yasm")
+  file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win32.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe")
 endif()
 
 message("checking i686-w64-mingw32-strings")
 # copy strings.exe to i686-w64-mingw32-strings for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe")
-	message("fixing i686-w64-mingw32-strings.exe")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe"
-	)
+  message("fixing i686-w64-mingw32-strings.exe")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe"
+  )
 endif()
 
 message("checking i686-w64-mingw32-ar.exe")
 # copy ar.exe to i686-w64-mingw32-ar.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe")
-	message("fixing i686-w64-mingw32-ar.exe")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe"
-	)
+  message("fixing i686-w64-mingw32-ar.exe")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe"
+  )
 endif()
 
 message("checking i686-w64-mingw32-strip.exe")
 # copy strip.exe to i686-w64-mingw32-strip.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe")
-	message("fixing i686-w64-mingw32-strip.exe")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe"
-	)
+  message("fixing i686-w64-mingw32-strip.exe")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe"
+  )
 endif()
 
 message("checking i686-w64-mingw32-ranlib.exe")
 # copy ranlib.exe to i686-w64-mingw32-ranlib.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe")
-	message("fixing i686-w64-mingw32-ranlib.exe")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe"
-	)
+  message("fixing i686-w64-mingw32-ranlib.exe")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe"
+  )
 endif()
diff --git a/build_files/build_environment/cmake/setup_mingw64.cmake b/build_files/build_environment/cmake/setup_mingw64.cmake
index 3ed020d373b..5ac9722d23d 100644
--- a/build_files/build_environment/cmake/setup_mingw64.cmake
+++ b/build_files/build_environment/cmake/setup_mingw64.cmake
@@ -24,11 +24,11 @@
 
 message("LIBDIR = ${LIBDIR}")
 macro(cmake_to_msys_path MsysPath ResultingPath)
-	string(REPLACE ":" "" TmpPath "${MsysPath}")
-	string(SUBSTRING ${TmpPath} 0 1 Drive)
-	string(SUBSTRING ${TmpPath} 1 255 PathPart)
-	string(TOLOWER ${Drive} LowerDrive)
-	string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart})
+  string(REPLACE ":" "" TmpPath "${MsysPath}")
+  string(SUBSTRING ${TmpPath} 0 1 Drive)
+  string(SUBSTRING ${TmpPath} 1 255 PathPart)
+  string(TOLOWER ${Drive} LowerDrive)
+  string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart})
 endmacro()
 cmake_to_msys_path(${LIBDIR} mingw_LIBDIR)
 message("mingw_LIBDIR = ${mingw_LIBDIR}")
@@ -36,192 +36,192 @@ message("mingw_LIBDIR = ${mingw_LIBDIR}")
 message("Checking for mingw64")
 # download ming64
 if(NOT EXISTS "${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z")
-	message("Downloading mingw64")
-	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.9.4/threads-win32/seh/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z" "${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z")
+  message("Downloading mingw64")
+  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.9.4/threads-win32/seh/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z" "${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z")
 endif()
 
 # make mingw root directory
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-	)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+  )
 endif()
 
 # extract mingw64
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/ming64sh.cmd") AND (EXISTS "${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z"))
-	message("Extracting mingw64")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
-	)
+  message("Extracting mingw64")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
+  )
 endif()
 
 message("Checking for pkg-config")
 if(NOT EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
-	message("Downloading pkg-config")
-	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
+  message("Downloading pkg-config")
+  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
 endif()
 
 # extract pkgconfig
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/pkg-config.exe") AND (EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"))
-	message("Extracting pkg-config")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
-	)
+  message("Extracting pkg-config")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/
+  )
 
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/pkg-config.exe"
-	)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/pkg-config.exe"
+  )
 
 endif()
 
 message("Checking for nasm")
 if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip")
-	message("Downloading nasm")
-	file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win64/nasm-2.13.02-win64.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip")
+  message("Downloading nasm")
+  file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win64/nasm-2.13.02-win64.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip")
 endif()
 
 # extract nasm
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip"))
-	message("Extracting nasm")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip"
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
-	)
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe"
-	)
+  message("Extracting nasm")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip"
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/
+  )
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe"
+  )
 
 endif()
 SET(NASM_PATH ${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe)
 
 message("Checking for mingwGet")
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
-	message("Downloading mingw-get")
-	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
+  message("Downloading mingw-get")
+  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
 endif()
 
 # extract mingw_get
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"))
-	message("Extracting mingw-get")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw64/
-	)
+  message("Extracting mingw-get")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw64/
+  )
 endif()
 
 if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/make.exe"))
-	message("Installing MSYS")
-	execute_process(
-		COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-patch
-		WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw64/bin/
-	)
+  message("Installing MSYS")
+  execute_process(
+    COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-patch
+    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw64/bin/
+  )
 endif()
 
 if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/mktemp.exe"))
-	message("Installing mktemp")
-	execute_process(
-		COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-mktemp
-		WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw64/bin/
-	)
+  message("Installing mktemp")
+  execute_process(
+    COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-mktemp
+    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw64/bin/
+  )
 endif()
 
 message("Checking for CoreUtils")
 # download old core_utils for pr.exe (ffmpeg needs it to build)
 if(NOT EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
-	message("Downloading CoreUtils 5.97")
-	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
+  message("Downloading CoreUtils 5.97")
+  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
 endif()
 
 if((EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/pr.exe"))
-	message("Installing pr from CoreUtils 5.97")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-	)
+  message("Installing pr from CoreUtils 5.97")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+  )
 
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
-	)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
+  )
 
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/pr.exe"
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
-	)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/pr.exe"
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
+  )
 endif()
 
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/ming64sh.cmd")
-	message("Installing ming64sh.cmd")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming64sh.cmd  ${DOWNLOAD_DIR}/mingw/mingw64/ming64sh.cmd
-	)
+  message("Installing ming64sh.cmd")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming64sh.cmd  ${DOWNLOAD_DIR}/mingw/mingw64/ming64sh.cmd
+  )
 endif()
 
 message("Checking for perl")
 # download perl for libvpx
 if(NOT EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip")
-	message("Downloading perl")
-	file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-64bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip")
+  message("Downloading perl")
+  file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-64bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip")
 endif()
 
 # make perl root directory
 if(NOT EXISTS "${DOWNLOAD_DIR}/perl")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-	)
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+  )
 endif()
 
 # extract perl
 if((NOT EXISTS "${DOWNLOAD_DIR}/perl/portable.perl") AND (EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip"))
-	message("Extracting perl")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip
-		WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl
-	)
+  message("Extracting perl")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip
+    WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl
+  )
 endif()
 
 # get yasm for vpx
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/yasm.exe")
-	message("Downloading yasm")
-	file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win64.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/yasm.exe")
+  message("Downloading yasm")
+  file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win64.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/yasm.exe")
 endif()
 
 message("checking x86_64-w64-mingw32-strings.exe")
 # copy strings.exe to x86_64-w64-mingw32-strings.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strings.exe")
-	message("fixing x86_64-w64-mingw32-strings.exe")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strings.exe"
-	)
+  message("fixing x86_64-w64-mingw32-strings.exe")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strings.exe"
+  )
 endif()
 
 message("checking x86_64-w64-mingw32-ar.exe")
 # copy ar.exe to x86_64-w64-mingw32-ar.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ar.exe")
-	message("fixing x86_64-w64-mingw32-ar.exe")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ar.exe"
-	)
+  message("fixing x86_64-w64-mingw32-ar.exe")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ar.exe"
+  )
 endif()
 
 message("checking x86_64-w64-mingw32-strip.exe")
 # copy strip.exe to x86_64-w64-mingw32-strip.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strip.exe")
-	message("fixing x86_64-w64-mingw32-strip.exe")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strip.exe"
-	)
+  message("fixing x86_64-w64-mingw32-strip.exe")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strip.exe"
+  )
 endif()
 
 message("checking x86_64-w64-mingw32-ranlib.exe")
 # copy ranlib.exe to x86_64-w64-mingw32-ranlib.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ranlib.exe")
-	message("fixing x86_64-w64-mingw32-ranlib.exe")
-	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ranlib.exe"
-	)
+  message("fixing x86_64-w64-mingw32-ranlib.exe")
+  execute_process(
+    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ranlib.exe"
+  )
 endif()
diff --git a/build_files/build_environment/cmake/sndfile.cmake b/build_files/build_environment/cmake/sndfile.cmake
index 2c4da159280..87d421a3764 100644
--- a/build_files/build_environment/cmake/sndfile.cmake
+++ b/build_files/build_environment/cmake/sndfile.cmake
@@ -20,43 +20,43 @@ set(SNDFILE_EXTRA_ARGS)
 set(SNDFILE_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/flac/lib/pkgconfig:${mingw_LIBDIR})
 
 if(WIN32)
-	set(SNDFILE_ENV set ${SNDFILE_ENV} &&)
-	#shared for windows because static libs will drag in a libgcc dependency.
-	set(SNDFILE_OPTIONS --disable-static --enable-shared )
+  set(SNDFILE_ENV set ${SNDFILE_ENV} &&)
+  #shared for windows because static libs will drag in a libgcc dependency.
+  set(SNDFILE_OPTIONS --disable-static --enable-shared )
 else()
-	set(SNDFILE_OPTIONS --enable-static --disable-shared )
+  set(SNDFILE_OPTIONS --enable-static --disable-shared )
 endif()
 
 if(UNIX)
-	set(SNDFILE_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/sndfile/src/external_sndfile < ${PATCH_DIR}/sndfile.diff)
+  set(SNDFILE_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/sndfile/src/external_sndfile < ${PATCH_DIR}/sndfile.diff)
 else()
-	set(SNDFILE_PATCH_CMD)
+  set(SNDFILE_PATCH_CMD)
 endif()
 
 ExternalProject_Add(external_sndfile
-	URL ${SNDFILE_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${SNDFILE_HASH}
-	PREFIX ${BUILD_DIR}/sndfile
-	PATCH_COMMAND ${SNDFILE_PATCH_CMD}
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make install
-	INSTALL_DIR ${LIBDIR}/sndfile
+  URL ${SNDFILE_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${SNDFILE_HASH}
+  PREFIX ${BUILD_DIR}/sndfile
+  PATCH_COMMAND ${SNDFILE_PATCH_CMD}
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make install
+  INSTALL_DIR ${LIBDIR}/sndfile
 )
 
 if(MSVC)
-	set_target_properties(external_sndfile PROPERTIES FOLDER Mingw)
+  set_target_properties(external_sndfile PROPERTIES FOLDER Mingw)
 endif()
 
 add_dependencies(
-	external_sndfile
-	external_ogg
-	external_vorbis
+  external_sndfile
+  external_ogg
+  external_vorbis
 )
 if(UNIX)
-	add_dependencies(
-		external_sndfile
-		external_flac
-	)
+  add_dependencies(
+    external_sndfile
+    external_flac
+  )
 endif()
diff --git a/build_files/build_environment/cmake/spnav.cmake b/build_files/build_environment/cmake/spnav.cmake
index 0dec9799715..5e67dbc5746 100644
--- a/build_files/build_environment/cmake/spnav.cmake
+++ b/build_files/build_environment/cmake/spnav.cmake
@@ -17,12 +17,12 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_spnav
-	URL ${SPNAV_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${SPNAV_HASH}
-	PREFIX ${BUILD_DIR}/spnav
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/spnav --disable-shared --enable-static --with-pic
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make install
-	INSTALL_DIR ${LIBDIR}/spnav
+  URL ${SPNAV_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${SPNAV_HASH}
+  PREFIX ${BUILD_DIR}/spnav
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/spnav --disable-shared --enable-static --with-pic
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make install
+  INSTALL_DIR ${LIBDIR}/spnav
 )
diff --git a/build_files/build_environment/cmake/sqlite.cmake b/build_files/build_environment/cmake/sqlite.cmake
index e5aa124a414..647e50b315a 100644
--- a/build_files/build_environment/cmake/sqlite.cmake
+++ b/build_files/build_environment/cmake/sqlite.cmake
@@ -20,38 +20,38 @@ set(SQLITE_CONFIGURE_ENV echo .)
 set(SQLITE_CONFIGURATION_ARGS)
 
 if(UNIX AND NOT APPLE)
-	set(SQLITE_LDFLAGS -Wl,--as-needed)
-	set(SQLITE_CFLAGS
-		"-DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_COLUMN_METADATA \
-		-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
-		-DSQLITE_ENABLE_RTREE=1 -DSQLITE_SOUNDEX=1 \
-		-DSQLITE_ENABLE_UNLOCK_NOTIFY \
-		-DSQLITE_OMIT_LOOKASIDE=1 -DSQLITE_ENABLE_DBSTAT_VTAB \
-		-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 \
-		-DSQLITE_ENABLE_LOAD_EXTENSION \
-		-DSQLITE_ENABLE_JSON1 \
-		-DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
-		-DSQLITE_THREADSAFE=1 \
-		-DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
-		-DSQLITE_MAX_SCHEMA_RETRY=25 \
-		-DSQLITE_ENABLE_PREUPDATE_HOOK \
-		-DSQLITE_ENABLE_SESSION \
-		-DSQLITE_ENABLE_STMTVTAB \
-		-DSQLITE_MAX_VARIABLE_NUMBER=250000 \
-		-fPIC")
-	set(SQLITE_CONFIGURE_ENV ${SQLITE_CONFIGURE_ENV} && export LDFLAGS=${SQLITE_LDFLAGS} && export CFLAGS=${SQLITE_CFLAGS})
-	set(SQLITE_CONFIGURATION_ARGS ${SQLITE_CONFIGURATION_ARGS} --enable-threadsafe --enable-load-extension --enable-json1 --enable-fts4 --enable-fts5
-	    --enable-shared=no)
+  set(SQLITE_LDFLAGS -Wl,--as-needed)
+  set(SQLITE_CFLAGS
+    "-DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_COLUMN_METADATA \
+    -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
+    -DSQLITE_ENABLE_RTREE=1 -DSQLITE_SOUNDEX=1 \
+    -DSQLITE_ENABLE_UNLOCK_NOTIFY \
+    -DSQLITE_OMIT_LOOKASIDE=1 -DSQLITE_ENABLE_DBSTAT_VTAB \
+    -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 \
+    -DSQLITE_ENABLE_LOAD_EXTENSION \
+    -DSQLITE_ENABLE_JSON1 \
+    -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
+    -DSQLITE_THREADSAFE=1 \
+    -DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
+    -DSQLITE_MAX_SCHEMA_RETRY=25 \
+    -DSQLITE_ENABLE_PREUPDATE_HOOK \
+    -DSQLITE_ENABLE_SESSION \
+    -DSQLITE_ENABLE_STMTVTAB \
+    -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
+    -fPIC")
+  set(SQLITE_CONFIGURE_ENV ${SQLITE_CONFIGURE_ENV} && export LDFLAGS=${SQLITE_LDFLAGS} && export CFLAGS=${SQLITE_CFLAGS})
+  set(SQLITE_CONFIGURATION_ARGS ${SQLITE_CONFIGURATION_ARGS} --enable-threadsafe --enable-load-extension --enable-json1 --enable-fts4 --enable-fts5
+      --enable-shared=no)
 endif()
 
 ExternalProject_Add(external_sqlite
-	URL ${SQLITE_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA1=${SQLITE_HASH}
-	PREFIX ${BUILD_DIR}/sqlite
-	PATCH_COMMAND ${SQLITE_PATCH_CMD}
-	CONFIGURE_COMMAND ${SQLITE_CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/sqlite ${SQLITE_CONFIGURATION_ARGS}
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make install
-	INSTALL_DIR ${LIBDIR}/sqlite
+  URL ${SQLITE_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH SHA1=${SQLITE_HASH}
+  PREFIX ${BUILD_DIR}/sqlite
+  PATCH_COMMAND ${SQLITE_PATCH_CMD}
+  CONFIGURE_COMMAND ${SQLITE_CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/sqlite ${SQLITE_CONFIGURATION_ARGS}
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make install
+  INSTALL_DIR ${LIBDIR}/sqlite
 )
diff --git a/build_files/build_environment/cmake/ssl.cmake b/build_files/build_environment/cmake/ssl.cmake
index 993e6f3ff6a..3ee59aa9c04 100644
--- a/build_files/build_environment/cmake/ssl.cmake
+++ b/build_files/build_environment/cmake/ssl.cmake
@@ -20,29 +20,29 @@ set(SSL_CONFIGURE_COMMAND ./Configure)
 set(SSL_PATCH_CMD echo .)
 
 if (APPLE)
-	set(SSL_OS_COMPILER "blender-darwin-x86_64")
+  set(SSL_OS_COMPILER "blender-darwin-x86_64")
 else()
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
-		set(SSL_OS_COMPILER "blender-linux-x86_64")
-	else()
-		set(SSL_OS_COMPILER "blender-linux-x86")
-	endif()
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
+    set(SSL_OS_COMPILER "blender-linux-x86_64")
+  else()
+    set(SSL_OS_COMPILER "blender-linux-x86")
+  endif()
 endif()
 
 ExternalProject_Add(external_ssl
-	URL ${SSL_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${SSL_HASH}
-	PREFIX ${BUILD_DIR}/ssl
-	PATCH_COMMAND ${SSL_PATCH_CMD}
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl
-		--openssldir=${LIBDIR}/ssl
-		no-shared
-		no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms
-		--config=${CMAKE_CURRENT_SOURCE_DIR}/cmake/ssl.conf
-		${SSL_OS_COMPILER}
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make install
-	INSTALL_DIR ${LIBDIR}/ssl
+  URL ${SSL_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH SHA256=${SSL_HASH}
+  PREFIX ${BUILD_DIR}/ssl
+  PATCH_COMMAND ${SSL_PATCH_CMD}
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl
+    --openssldir=${LIBDIR}/ssl
+    no-shared
+    no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms
+    --config=${CMAKE_CURRENT_SOURCE_DIR}/cmake/ssl.conf
+    ${SSL_OS_COMPILER}
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make install
+  INSTALL_DIR ${LIBDIR}/ssl
 )
diff --git a/build_files/build_environment/cmake/tbb.cmake b/build_files/build_environment/cmake/tbb.cmake
index 4e0357da8bb..30efaeef8a9 100644
--- a/build_files/build_environment/cmake/tbb.cmake
+++ b/build_files/build_environment/cmake/tbb.cmake
@@ -17,36 +17,36 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(TBB_EXTRA_ARGS
-	-DTBB_BUILD_SHARED=Off
-	-DTBB_BUILD_TBBMALLOC=Off
-	-DTBB_BUILD_TBBMALLOC_PROXY=Off
-	-DTBB_BUILD_STATIC=On
+  -DTBB_BUILD_SHARED=Off
+  -DTBB_BUILD_TBBMALLOC=Off
+  -DTBB_BUILD_TBBMALLOC_PROXY=Off
+  -DTBB_BUILD_STATIC=On
 )
 
 # CMake script for TBB from https://github.com/wjakob/tbb/blob/master/CMakeLists.txt
 ExternalProject_Add(external_tbb
-	URL ${TBB_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${TBB_HASH}
-	PREFIX ${BUILD_DIR}/tbb
-	PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_tbb.txt ${BUILD_DIR}/tbb/src/external_tbb/CMakeLists.txt &&
-	${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tbb ${DEFAULT_CMAKE_FLAGS} ${TBB_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/tbb
+  URL ${TBB_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${TBB_HASH}
+  PREFIX ${BUILD_DIR}/tbb
+  PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_tbb.txt ${BUILD_DIR}/tbb/src/external_tbb/CMakeLists.txt &&
+  ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tbb ${DEFAULT_CMAKE_FLAGS} ${TBB_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/tbb
 )
 
 if (WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_tbb after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_tbb after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib
-			DEPENDEES install
-		)
-	endif()
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_tbb after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/
+      DEPENDEES install
+    )
+  endif()
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(external_tbb after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib
+      DEPENDEES install
+    )
+  endif()
 endif()
diff --git a/build_files/build_environment/cmake/theora.cmake b/build_files/build_environment/cmake/theora.cmake
index 4fa2f4815fa..e5f94b15b02 100644
--- a/build_files/build_environment/cmake/theora.cmake
+++ b/build_files/build_environment/cmake/theora.cmake
@@ -17,28 +17,28 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_theora
-	URL ${THEORA_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${THEORA_HASH}
-	PREFIX ${BUILD_DIR}/theora
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/theora
-		--disable-shared
-		--enable-static
-		--with-pic
-		--with-ogg=${LIBDIR}/ogg
-		--with-vorbis=${LIBDIR}/vorbis
-		--disable-examples
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && make install
-	INSTALL_DIR ${LIBDIR}/theora
+  URL ${THEORA_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH SHA256=${THEORA_HASH}
+  PREFIX ${BUILD_DIR}/theora
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/theora
+    --disable-shared
+    --enable-static
+    --with-pic
+    --with-ogg=${LIBDIR}/ogg
+    --with-vorbis=${LIBDIR}/vorbis
+    --disable-examples
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && make install
+  INSTALL_DIR ${LIBDIR}/theora
 )
 
 add_dependencies(
-	external_theora
-	external_vorbis
-	external_ogg
+  external_theora
+  external_vorbis
+  external_ogg
 )
 
 if(MSVC)
-	set_target_properties(external_theora PROPERTIES FOLDER Mingw)
+  set_target_properties(external_theora PROPERTIES FOLDER Mingw)
 endif()
diff --git a/build_files/build_environment/cmake/tiff.cmake b/build_files/build_environment/cmake/tiff.cmake
index 498145463cf..fa5a1423603 100644
--- a/build_files/build_environment/cmake/tiff.cmake
+++ b/build_files/build_environment/cmake/tiff.cmake
@@ -17,31 +17,31 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(TIFF_EXTRA_ARGS
-	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
-	-DPNG_STATIC=ON
-	-DBUILD_SHARED_LIBS=OFF
-	-Dlzma=OFF
-	-Djbig=OFF
+  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
+  -DPNG_STATIC=ON
+  -DBUILD_SHARED_LIBS=OFF
+  -Dlzma=OFF
+  -Djbig=OFF
 )
 
 ExternalProject_Add(external_tiff
-	URL ${TIFF_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${TIFF_HASH}
-	PREFIX ${BUILD_DIR}/tiff
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tiff ${DEFAULT_CMAKE_FLAGS} ${TIFF_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/tiff
+  URL ${TIFF_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${TIFF_HASH}
+  PREFIX ${BUILD_DIR}/tiff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tiff ${DEFAULT_CMAKE_FLAGS} ${TIFF_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/tiff
 )
 
 add_dependencies(
-	external_tiff
-	external_zlib
+  external_tiff
+  external_zlib
 )
 
 if(WIN32 AND BUILD_MODE STREQUAL Debug)
-	ExternalProject_Add_Step(external_tiff after_install
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiffd${LIBEXT} ${LIBDIR}/tiff/lib/tiff${LIBEXT}
-		DEPENDEES install
-	)
+  ExternalProject_Add_Step(external_tiff after_install
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiffd${LIBEXT} ${LIBDIR}/tiff/lib/tiff${LIBEXT}
+    DEPENDEES install
+  )
 endif()
diff --git a/build_files/build_environment/cmake/tinyxml.cmake b/build_files/build_environment/cmake/tinyxml.cmake
index 9c7d0397c78..cbbbb0a0a49 100644
--- a/build_files/build_environment/cmake/tinyxml.cmake
+++ b/build_files/build_environment/cmake/tinyxml.cmake
@@ -20,12 +20,12 @@ set(TINYXML_EXTRA_ARGS
 )
 
 ExternalProject_Add(external_tinyxml
-	URL ${TINYXML_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${TINYXML_HASH}
-	PREFIX ${BUILD_DIR}/tinyxml
-	#patch taken from ocio
-	PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/tinyxml/src/external_tinyxml < ${PATCH_DIR}/tinyxml.diff
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tinyxml ${DEFAULT_CMAKE_FLAGS} ${TINYXML_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/tinyxml
+  URL ${TINYXML_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${TINYXML_HASH}
+  PREFIX ${BUILD_DIR}/tinyxml
+  #patch taken from ocio
+  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/tinyxml/src/external_tinyxml < ${PATCH_DIR}/tinyxml.diff
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tinyxml ${DEFAULT_CMAKE_FLAGS} ${TINYXML_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/tinyxml
 )
diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake
index d3e3f7bea6a..0a3c279f7e2 100644
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -47,27 +47,27 @@ set(PTHREADS_HASH f3bf81bb395840b3446197bcf4ecd653)
 
 set(ILMBASE_VERSION 2.3.0)
 if (WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		set(ILMBASE_VERSION_POSTFIX _s)
-		set(OPENEXR_VERSION_POSTFIX _s)
-	else()
-		set(ILMBASE_VERSION_POSTFIX _s_d)
-		set(OPENEXR_VERSION_POSTFIX _s_d)
-	endif()
+  if(BUILD_MODE STREQUAL Release)
+    set(ILMBASE_VERSION_POSTFIX _s)
+    set(OPENEXR_VERSION_POSTFIX _s)
+  else()
+    set(ILMBASE_VERSION_POSTFIX _s_d)
+    set(OPENEXR_VERSION_POSTFIX _s_d)
+  endif()
 else()
-	set(ILMBASE_VERSION_POSTFIX)
+  set(ILMBASE_VERSION_POSTFIX)
 endif()
 set(ILMBASE_URI https://github.com/openexr/openexr/releases/download/v${ILMBASE_VERSION}/ilmbase-${ILMBASE_VERSION}.tar.gz)
 set(ILMBASE_HASH 354bf86de3b930ab87ac63619d60c860)
 
 set(OPENEXR_VERSION 2.3.0)
 if (WIN32) #release 2.3.0 tarball has broken cmake support
-	set(OPENEXR_URI https://github.com/openexr/openexr/archive/0ac2ea34c8f3134148a5df4052e40f155b76f6fb.tar.gz)
-	set(OPENEXR_HASH ed159435d508240712fbaaa21d94bafb)
+  set(OPENEXR_URI https://github.com/openexr/openexr/archive/0ac2ea34c8f3134148a5df4052e40f155b76f6fb.tar.gz)
+  set(OPENEXR_HASH ed159435d508240712fbaaa21d94bafb)
 else()
-	set(OPENEXR_VERSION_POSTFIX)
-	set(OPENEXR_URI https://github.com/openexr/openexr/releases/download/v${OPENEXR_VERSION}/openexr-${OPENEXR_VERSION}.tar.gz)
-	set(OPENEXR_HASH a157e8a46596bc185f2472a5a4682174)
+  set(OPENEXR_VERSION_POSTFIX)
+  set(OPENEXR_URI https://github.com/openexr/openexr/releases/download/v${OPENEXR_VERSION}/openexr-${OPENEXR_VERSION}.tar.gz)
+  set(OPENEXR_HASH a157e8a46596bc185f2472a5a4682174)
 endif()
 
 set(FREETYPE_VERSION 2.9.1)
diff --git a/build_files/build_environment/cmake/vorbis.cmake b/build_files/build_environment/cmake/vorbis.cmake
index ee3c5a9c87f..9ef62787e86 100644
--- a/build_files/build_environment/cmake/vorbis.cmake
+++ b/build_files/build_environment/cmake/vorbis.cmake
@@ -17,25 +17,25 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_vorbis
-	URL ${VORBIS_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${VORBIS_HASH}
-	PREFIX ${BUILD_DIR}/vorbis
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/vorbis
-		--disable-shared
-		--enable-static
-		--with-pic
-		--with-ogg=${LIBDIR}/ogg
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && make install
-	INSTALL_DIR ${LIBDIR}/vorbis
+  URL ${VORBIS_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH SHA256=${VORBIS_HASH}
+  PREFIX ${BUILD_DIR}/vorbis
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/vorbis
+    --disable-shared
+    --enable-static
+    --with-pic
+    --with-ogg=${LIBDIR}/ogg
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && make install
+  INSTALL_DIR ${LIBDIR}/vorbis
 )
 
 add_dependencies(
-	external_vorbis
-	external_ogg
+  external_vorbis
+  external_ogg
 )
 
 if(MSVC)
-	set_target_properties(external_vorbis PROPERTIES FOLDER Mingw)
+  set_target_properties(external_vorbis PROPERTIES FOLDER Mingw)
 endif()
diff --git a/build_files/build_environment/cmake/vpx.cmake b/build_files/build_environment/cmake/vpx.cmake
index 8989262135b..1c3a7081b59 100644
--- a/build_files/build_environment/cmake/vpx.cmake
+++ b/build_files/build_environment/cmake/vpx.cmake
@@ -17,44 +17,44 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(VPX_EXTRA_FLAGS --target=x86_64-win64-gcc --disable-multithread)
-	else()
-		set(VPX_EXTRA_FLAGS --target=x86-win32-gcc --disable-multithread)
-	endif()
+  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+    set(VPX_EXTRA_FLAGS --target=x86_64-win64-gcc --disable-multithread)
+  else()
+    set(VPX_EXTRA_FLAGS --target=x86-win32-gcc --disable-multithread)
+  endif()
 else()
-	if(APPLE)
-		set(VPX_EXTRA_FLAGS --target=x86_64-darwin13-gcc)
-	else()
-		set(VPX_EXTRA_FLAGS --target=generic-gnu)
-	endif()
+  if(APPLE)
+    set(VPX_EXTRA_FLAGS --target=x86_64-darwin13-gcc)
+  else()
+    set(VPX_EXTRA_FLAGS --target=generic-gnu)
+  endif()
 endif()
 
 ExternalProject_Add(external_vpx
-	URL ${VPX_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${VPX_HASH}
-	PREFIX ${BUILD_DIR}/vpx
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
-		cd ${BUILD_DIR}/vpx/src/external_vpx/ &&
-		${CONFIGURE_COMMAND_NO_TARGET} --prefix=${LIBDIR}/vpx
-			--disable-shared
-			--enable-static
-			--disable-install-bins
-			--disable-install-srcs
-			--disable-sse4_1
-			--disable-sse3
-			--disable-ssse3
-			--disable-avx
-			--disable-avx2
-			--disable-unit-tests
-			--disable-examples
-			${VPX_EXTRA_FLAGS}
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make install
-	INSTALL_DIR ${LIBDIR}/vpx
+  URL ${VPX_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH SHA256=${VPX_HASH}
+  PREFIX ${BUILD_DIR}/vpx
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+    cd ${BUILD_DIR}/vpx/src/external_vpx/ &&
+    ${CONFIGURE_COMMAND_NO_TARGET} --prefix=${LIBDIR}/vpx
+      --disable-shared
+      --enable-static
+      --disable-install-bins
+      --disable-install-srcs
+      --disable-sse4_1
+      --disable-sse3
+      --disable-ssse3
+      --disable-avx
+      --disable-avx2
+      --disable-unit-tests
+      --disable-examples
+      ${VPX_EXTRA_FLAGS}
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make install
+  INSTALL_DIR ${LIBDIR}/vpx
 )
 
 if(MSVC)
-	set_target_properties(external_vpx PROPERTIES FOLDER Mingw)
+  set_target_properties(external_vpx PROPERTIES FOLDER Mingw)
 endif()
diff --git a/build_files/build_environment/cmake/webp.cmake b/build_files/build_environment/cmake/webp.cmake
index 92cd41b96ff..73557859ae6 100644
--- a/build_files/build_environment/cmake/webp.cmake
+++ b/build_files/build_environment/cmake/webp.cmake
@@ -20,22 +20,22 @@
 # library itself does not depend on them, so should give no problems.
 
 set(WEBP_EXTRA_ARGS
-	-DWEBP_HAVE_SSE2=ON
-	-DWEBP_HAVE_SSE41=OFF
-	-DWEBP_HAVE_AVX2=OFF
+  -DWEBP_HAVE_SSE2=ON
+  -DWEBP_HAVE_SSE41=OFF
+  -DWEBP_HAVE_AVX2=OFF
 )
 
 if(WIN32)
-	set(WEBP_BUILD_DIR ${BUILD_MODE}/)
+  set(WEBP_BUILD_DIR ${BUILD_MODE}/)
 else()
-	set(WEBP_BUILD_DIR)
+  set(WEBP_BUILD_DIR)
 endif()
 
 ExternalProject_Add(external_webp
-	URL ${WEBP_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${WEBP_HASH}
-	PREFIX ${BUILD_DIR}/webp
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/webp -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${WEBP_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/webp
+  URL ${WEBP_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${WEBP_HASH}
+  PREFIX ${BUILD_DIR}/webp
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/webp -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${WEBP_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/webp
 )
diff --git a/build_files/build_environment/cmake/x264.cmake b/build_files/build_environment/cmake/x264.cmake
index 7d7b0758aaf..eba0709e196 100644
--- a/build_files/build_environment/cmake/x264.cmake
+++ b/build_files/build_environment/cmake/x264.cmake
@@ -17,29 +17,29 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-	set(X264_EXTRA_ARGS --enable-win32thread --cross-prefix=${MINGW_HOST}- --host=${MINGW_HOST})
-	set(X264_PATCH_CMD ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/x264/src/external_x264 < ${PATCH_DIR}/x264.diff)
+  set(X264_EXTRA_ARGS --enable-win32thread --cross-prefix=${MINGW_HOST}- --host=${MINGW_HOST})
+  set(X264_PATCH_CMD ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/x264/src/external_x264 < ${PATCH_DIR}/x264.diff)
 else()
-	set(X264_PATCH_CMD echo .)
+  set(X264_PATCH_CMD echo .)
 endif()
 
 
 ExternalProject_Add(external_x264
-	URL ${X264_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${X264_HASH}
-	PREFIX ${BUILD_DIR}/x264
-	PATCH_COMMAND ${X264_PATCH_CMD}
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264
-		--enable-static
-		--enable-pic
-		--disable-lavf
-		${X264_EXTRA_ARGS}
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make install
-	INSTALL_DIR ${LIBDIR}/x264
+  URL ${X264_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH SHA256=${X264_HASH}
+  PREFIX ${BUILD_DIR}/x264
+  PATCH_COMMAND ${X264_PATCH_CMD}
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264
+    --enable-static
+    --enable-pic
+    --disable-lavf
+    ${X264_EXTRA_ARGS}
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make install
+  INSTALL_DIR ${LIBDIR}/x264
 )
 
 if(MSVC)
-	set_target_properties(external_x264 PROPERTIES FOLDER Mingw)
+  set_target_properties(external_x264 PROPERTIES FOLDER Mingw)
 endif()
diff --git a/build_files/build_environment/cmake/xml2.cmake b/build_files/build_environment/cmake/xml2.cmake
index a8f87a67ad4..e4af71ef7c7 100644
--- a/build_files/build_environment/cmake/xml2.cmake
+++ b/build_files/build_environment/cmake/xml2.cmake
@@ -17,20 +17,20 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_xml2
-	URL ${XML2_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${XML2_HASH}
-	PREFIX ${BUILD_DIR}/xml2
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && ${CONFIGURE_COMMAND}
-		--prefix=${LIBDIR}/xml2
-		--disable-shared
-		--enable-static
-		--with-pic
-		--with-python=no
-		--with-lzma=no
-		--with-zlib=no
-		--with-iconv=no
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make install
-	INSTALL_DIR ${LIBDIR}/xml2
+  URL ${XML2_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${XML2_HASH}
+  PREFIX ${BUILD_DIR}/xml2
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && ${CONFIGURE_COMMAND}
+    --prefix=${LIBDIR}/xml2
+    --disable-shared
+    --enable-static
+    --with-pic
+    --with-python=no
+    --with-lzma=no
+    --with-zlib=no
+    --with-iconv=no
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make install
+  INSTALL_DIR ${LIBDIR}/xml2
 )
diff --git a/build_files/build_environment/cmake/xvidcore.cmake b/build_files/build_environment/cmake/xvidcore.cmake
index a341275ea47..5ff897fcc6f 100644
--- a/build_files/build_environment/cmake/xvidcore.cmake
+++ b/build_files/build_environment/cmake/xvidcore.cmake
@@ -17,28 +17,28 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-	set(XVIDCORE_EXTRA_ARGS --host=${MINGW_HOST})
+  set(XVIDCORE_EXTRA_ARGS --host=${MINGW_HOST})
 endif()
 
 ExternalProject_Add(external_xvidcore
-	URL ${XVIDCORE_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${XVIDCORE_HASH}
-	PREFIX ${BUILD_DIR}/xvidcore
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/xvidcore ${XVIDCORE_EXTRA_ARGS}
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} &&
-	${CMAKE_COMMAND} -E remove ${LIBDIR}/xvidcore/lib/* && # clean because re-installing fails otherwise
-	cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && make install
-	INSTALL_DIR ${LIBDIR}/xvidcore
+  URL ${XVIDCORE_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH SHA256=${XVIDCORE_HASH}
+  PREFIX ${BUILD_DIR}/xvidcore
+  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/xvidcore ${XVIDCORE_EXTRA_ARGS}
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && make -j${MAKE_THREADS}
+  INSTALL_COMMAND ${CONFIGURE_ENV} &&
+  ${CMAKE_COMMAND} -E remove ${LIBDIR}/xvidcore/lib/* && # clean because re-installing fails otherwise
+  cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && make install
+  INSTALL_DIR ${LIBDIR}/xvidcore
 )
 
 ExternalProject_Add_Step(external_xvidcore after_install
-	COMMAND ${CMAKE_COMMAND} -E rename ${LIBDIR}/xvidcore/lib/xvidcore.a ${LIBDIR}/xvidcore/lib/libxvidcore.a || true
-	COMMAND ${CMAKE_COMMAND} -E remove ${LIBDIR}/xvidcore/lib/xvidcore.dll.a
-	DEPENDEES install
+  COMMAND ${CMAKE_COMMAND} -E rename ${LIBDIR}/xvidcore/lib/xvidcore.a ${LIBDIR}/xvidcore/lib/libxvidcore.a || true
+  COMMAND ${CMAKE_COMMAND} -E remove ${LIBDIR}/xvidcore/lib/xvidcore.dll.a
+  DEPENDEES install
 )
 
 if(MSVC)
-	set_target_properties(external_xvidcore PROPERTIES FOLDER Mingw)
+  set_target_properties(external_xvidcore PROPERTIES FOLDER Mingw)
 endif()
diff --git a/build_files/build_environment/cmake/yamlcpp.cmake b/build_files/build_environment/cmake/yamlcpp.cmake
index 617158ff40a..b0ce77d079f 100644
--- a/build_files/build_environment/cmake/yamlcpp.cmake
+++ b/build_files/build_environment/cmake/yamlcpp.cmake
@@ -17,18 +17,18 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(YAMLCPP_EXTRA_ARGS
-	-DBUILD_GMOCK=OFF
-	-DYAML_CPP_BUILD_TESTS=OFF
-	-DYAML_CPP_BUILD_TOOLS=OFF
-	-DYAML_CPP_BUILD_CONTRIB=OFF
-	-DMSVC_SHARED_RT=OFF
+  -DBUILD_GMOCK=OFF
+  -DYAML_CPP_BUILD_TESTS=OFF
+  -DYAML_CPP_BUILD_TOOLS=OFF
+  -DYAML_CPP_BUILD_CONTRIB=OFF
+  -DMSVC_SHARED_RT=OFF
 )
 
 ExternalProject_Add(external_yamlcpp
-	URL ${YAMLCPP_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${YAMLCPP_HASH}
-	PREFIX ${BUILD_DIR}/yamlcpp
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/yamlcpp ${DEFAULT_CMAKE_FLAGS} ${YAMLCPP_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/yamlcpp
+  URL ${YAMLCPP_URI}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  URL_HASH MD5=${YAMLCPP_HASH}
+  PREFIX ${BUILD_DIR}/yamlcpp
+  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/yamlcpp ${DEFAULT_CMAKE_FLAGS} ${YAMLCPP_EXTRA_ARGS}
+  INSTALL_DIR ${LIBDIR}/yamlcpp
 )
diff --git a/build_files/build_environment/cmake/zlib.cmake b/build_files/build_environment/cmake/zlib.cmake
index 3c07fb3c08a..f8594bd037c 100644
--- a/build_files/build_environment/cmake/zlib.cmake
+++ b/build_files/build_environment/cmake/zlib.cmake
@@ -17,31 +17,31 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_zlib
-	URL ${ZLIB_URI}
-	URL_HASH MD5=${ZLIB_HASH}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	PREFIX ${BUILD_DIR}/zlib
-	CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib ${DEFAULT_CMAKE_FLAGS}
-	INSTALL_DIR ${LIBDIR}/zlib
+  URL ${ZLIB_URI}
+  URL_HASH MD5=${ZLIB_HASH}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  PREFIX ${BUILD_DIR}/zlib
+  CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib ${DEFAULT_CMAKE_FLAGS}
+  INSTALL_DIR ${LIBDIR}/zlib
 )
 
 if (WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_zlib after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st${LIBEXT}
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_zlib after_install
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st_d${LIBEXT}
-		DEPENDEES install
-		)
-	endif()
+  if(BUILD_MODE STREQUAL Release)
+    ExternalProject_Add_Step(external_zlib after_install
+      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st${LIBEXT}
+      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/
+      DEPENDEES install
+    )
+  endif()
+  if(BUILD_MODE STREQUAL Debug)
+    ExternalProject_Add_Step(external_zlib after_install
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st_d${LIBEXT}
+    DEPENDEES install
+    )
+  endif()
 else()
-	ExternalProject_Add_Step(external_zlib after_install
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/libz.a ${LIBDIR}/zlib/lib/libz_pic.a
-		DEPENDEES install
-	)
+  ExternalProject_Add_Step(external_zlib after_install
+    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/libz.a ${LIBDIR}/zlib/lib/libz_pic.a
+    DEPENDEES install
+  )
 endif()
diff --git a/build_files/build_environment/cmake/zlib_mingw.cmake b/build_files/build_environment/cmake/zlib_mingw.cmake
index 56578857a47..1a7bc1dc51b 100644
--- a/build_files/build_environment/cmake/zlib_mingw.cmake
+++ b/build_files/build_environment/cmake/zlib_mingw.cmake
@@ -17,23 +17,23 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_zlib_mingw
-	URL ${ZLIB_URI}
-	URL_HASH MD5=${ZLIB_HASH}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	PREFIX ${BUILD_DIR}/zlib_mingw
-	CONFIGURE_COMMAND echo .
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/zlib_mingw/src/external_zlib_mingw/ && make -f win32/makefile.gcc -j${MAKE_THREADS}
-	INSTALL_COMMAND echo .
-	INSTALL_DIR ${LIBDIR}/zlib_mingw
+  URL ${ZLIB_URI}
+  URL_HASH MD5=${ZLIB_HASH}
+  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+  PREFIX ${BUILD_DIR}/zlib_mingw
+  CONFIGURE_COMMAND echo .
+  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/zlib_mingw/src/external_zlib_mingw/ && make -f win32/makefile.gcc -j${MAKE_THREADS}
+  INSTALL_COMMAND echo .
+  INSTALL_DIR ${LIBDIR}/zlib_mingw
 )
 
 if(BUILD_MODE STREQUAL Release)
-	ExternalProject_Add_Step(external_zlib_mingw after_install
-		COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/zlib_mingw/src/external_zlib_mingw/libz.a ${LIBDIR}/zlib/lib/z.lib
-		DEPENDEES install
-	)
+  ExternalProject_Add_Step(external_zlib_mingw after_install
+    COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/zlib_mingw/src/external_zlib_mingw/libz.a ${LIBDIR}/zlib/lib/z.lib
+    DEPENDEES install
+  )
 endif()
 
 if(MSVC)
-	set_target_properties(external_zlib_mingw PROPERTIES FOLDER Mingw)
+  set_target_properties(external_zlib_mingw PROPERTIES FOLDER Mingw)
 endif()