Cleanup: use 2 space indentation for CMake

7 files changed, 725 insertions, 725 deletions

diff --git a/intern/CMakeLists.txt b/intern/CMakeLists.txt
index 83e3bc8208d..b93f2057b47 100644
--- a/intern/CMakeLists.txt
+++ b/intern/CMakeLists.txt
@@ -33,46 +33,46 @@ add_subdirectory(glew-mx)
 add_subdirectory(eigen)
 
 if(WITH_AUDASPACE)
-	add_subdirectory(audaspace)
+  add_subdirectory(audaspace)
 endif()
 
 if(WITH_MOD_REMESH)
-	add_subdirectory(dualcon)
+  add_subdirectory(dualcon)
 endif()
 
 if(WITH_MOD_FLUID)
-	add_subdirectory(elbeem)
+  add_subdirectory(elbeem)
 endif()
 
 if(WITH_MOD_SMOKE)
-	add_subdirectory(smoke)
+  add_subdirectory(smoke)
 endif()
 
 if(WITH_IK_SOLVER)
-	add_subdirectory(iksolver)
+  add_subdirectory(iksolver)
 endif()
 
 if(WITH_IK_ITASC)
-	add_subdirectory(itasc)
+  add_subdirectory(itasc)
 endif()
 
 if(WITH_CYCLES)
-	add_subdirectory(cycles)
+  add_subdirectory(cycles)
 endif()
 
 if(WITH_INTERNATIONAL)
-	add_subdirectory(locale)
+  add_subdirectory(locale)
 endif()
 
 if(WITH_BULLET)
-	add_subdirectory(rigidbody)
+  add_subdirectory(rigidbody)
 endif()
 
 # only windows needs utf16 converter
 if(WIN32)
-	add_subdirectory(utfconv)
+  add_subdirectory(utfconv)
 endif()
 
 if(WITH_OPENVDB)
-	add_subdirectory(openvdb)
+  add_subdirectory(openvdb)
 endif()
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt
index d70f3939a40..926329be61b 100644
--- a/intern/elbeem/CMakeLists.txt
+++ b/intern/elbeem/CMakeLists.txt
@@ -19,70 +19,70 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-	extern
-	../guardedalloc
+  extern
+  ../guardedalloc
 )
 
 set(INC_SYS
-	${PNG_INCLUDE_DIRS}
-	${ZLIB_INCLUDE_DIRS}
+  ${PNG_INCLUDE_DIRS}
+  ${ZLIB_INCLUDE_DIRS}
 )
 
 set(SRC
-	intern/attributes.cpp
-	intern/controlparticles.cpp
-	intern/elbeem.cpp
-	intern/elbeem_control.cpp
-	intern/isosurface.cpp
-	intern/mvmcoords.cpp
-	intern/ntl_blenderdumper.cpp
-	intern/ntl_bsptree.cpp
-	intern/ntl_geometrymodel.cpp
-	intern/ntl_geometryobject.cpp
-	intern/ntl_lighting.cpp
-	intern/ntl_ray.cpp
-	intern/ntl_world.cpp
-	intern/parametrizer.cpp
-	intern/particletracer.cpp
-	intern/simulation_object.cpp
-	intern/solver_adap.cpp
-	intern/solver_control.cpp
-	intern/solver_init.cpp
-	intern/solver_interface.cpp
-	intern/solver_main.cpp
-	intern/solver_util.cpp
-	intern/utilities.cpp
+  intern/attributes.cpp
+  intern/controlparticles.cpp
+  intern/elbeem.cpp
+  intern/elbeem_control.cpp
+  intern/isosurface.cpp
+  intern/mvmcoords.cpp
+  intern/ntl_blenderdumper.cpp
+  intern/ntl_bsptree.cpp
+  intern/ntl_geometrymodel.cpp
+  intern/ntl_geometryobject.cpp
+  intern/ntl_lighting.cpp
+  intern/ntl_ray.cpp
+  intern/ntl_world.cpp
+  intern/parametrizer.cpp
+  intern/particletracer.cpp
+  intern/simulation_object.cpp
+  intern/solver_adap.cpp
+  intern/solver_control.cpp
+  intern/solver_init.cpp
+  intern/solver_interface.cpp
+  intern/solver_main.cpp
+  intern/solver_util.cpp
+  intern/utilities.cpp
 
-	extern/LBM_fluidsim.h
-	extern/elbeem.h
-	intern/attributes.h
-	intern/controlparticles.h
-	intern/elbeem_control.h
-	intern/isosurface.h
-	intern/loop_tools.h
-	intern/mcubes_tables.h
-	intern/mvmcoords.h
-	intern/ntl_blenderdumper.h
-	intern/ntl_bsptree.h
-	intern/ntl_geometryclass.h
-	intern/ntl_geometrymodel.h
-	intern/ntl_geometryobject.h
-	intern/ntl_geometryshader.h
-	intern/ntl_lighting.h
-	intern/ntl_matrices.h
-	intern/ntl_ray.h
-	intern/ntl_vector3dim.h
-	intern/ntl_world.h
-	intern/paraloopend.h
-	intern/parametrizer.h
-	intern/particletracer.h
-	intern/simulation_object.h
-	intern/solver_class.h
-	intern/solver_control.h
-	intern/solver_interface.h
-	intern/solver_relax.h
-	intern/utilities.h
-	intern/globals.h
+  extern/LBM_fluidsim.h
+  extern/elbeem.h
+  intern/attributes.h
+  intern/controlparticles.h
+  intern/elbeem_control.h
+  intern/isosurface.h
+  intern/loop_tools.h
+  intern/mcubes_tables.h
+  intern/mvmcoords.h
+  intern/ntl_blenderdumper.h
+  intern/ntl_bsptree.h
+  intern/ntl_geometryclass.h
+  intern/ntl_geometrymodel.h
+  intern/ntl_geometryobject.h
+  intern/ntl_geometryshader.h
+  intern/ntl_lighting.h
+  intern/ntl_matrices.h
+  intern/ntl_ray.h
+  intern/ntl_vector3dim.h
+  intern/ntl_world.h
+  intern/paraloopend.h
+  intern/parametrizer.h
+  intern/particletracer.h
+  intern/simulation_object.h
+  intern/solver_class.h
+  intern/solver_control.h
+  intern/solver_interface.h
+  intern/solver_relax.h
+  intern/utilities.h
+  intern/globals.h
 )
 
 set(LIB
@@ -92,31 +92,31 @@ set(LIB
 remove_strict_flags()
 
 add_definitions(
-	-DNOGUI
-	-DELBEEM_BLENDER=1
+  -DNOGUI
+  -DELBEEM_BLENDER=1
 )
 
 # not essential but quiet gcc's -Wundef
 add_definitions(
-	-DLBM_PRECISION=1
-	-DLBM_INCLUDE_TESTSOLVERS=0
-	-DFSGR_STRICT_DEBUG=0
-	-DELBEEM_MPI=0
-	-DNEWDIRVELMOTEST=0
+  -DLBM_PRECISION=1
+  -DLBM_INCLUDE_TESTSOLVERS=0
+  -DFSGR_STRICT_DEBUG=0
+  -DELBEEM_MPI=0
+  -DNEWDIRVELMOTEST=0
 )
 
 if(WIN32)
-	# We need BLI_gzopen on win32 for unicode paths
-	add_definitions(
-		-DLBM_GZIP_OVERRIDE_H="${CMAKE_SOURCE_DIR}/source/blender/blenlib/BLI_fileops.h"
-		-D LBM_GZIP_OPEN_FN="\(gzFile\)BLI_gzopen"
-	)
+  # We need BLI_gzopen on win32 for unicode paths
+  add_definitions(
+    -DLBM_GZIP_OVERRIDE_H="${CMAKE_SOURCE_DIR}/source/blender/blenlib/BLI_fileops.h"
+    -D LBM_GZIP_OPEN_FN="\(gzFile\)BLI_gzopen"
+  )
 endif()
 
 if(WITH_OPENMP)
-	add_definitions(-DPARALLEL=1)
+  add_definitions(-DPARALLEL=1)
 else()
-	add_definitions(-DPARALLEL=0)
+  add_definitions(-DPARALLEL=0)
 endif()
 
 blender_add_lib_nolist(bf_intern_elbeem "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/intern/itasc/CMakeLists.txt b/intern/itasc/CMakeLists.txt
index c0f48bcf957..060e5378fc4 100644
--- a/intern/itasc/CMakeLists.txt
+++ b/intern/itasc/CMakeLists.txt
@@ -23,334 +23,334 @@ set(INC
 )
 
 set(INC_SYS
-	${EIGEN3_INCLUDE_DIRS}
+  ${EIGEN3_INCLUDE_DIRS}
 )
 
 if(NOT WITH_SYSTEM_EIGEN3)
-	set(EIGEN3_HEADERS
-		# until we have another user...
-		../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h
-		../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
-		../../extern/Eigen3/Eigen/src/Cholesky/LLT_MKL.h
-		../../extern/Eigen3/Eigen/src/CholmodSupport/CholmodSupport.h
-		../../extern/Eigen3/Eigen/src/Core/Array.h
-		../../extern/Eigen3/Eigen/src/Core/ArrayBase.h
-		../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
-		../../extern/Eigen3/Eigen/src/Core/Assign.h
-		../../extern/Eigen3/Eigen/src/Core/Assign_MKL.h
-		../../extern/Eigen3/Eigen/src/Core/BandMatrix.h
-		../../extern/Eigen3/Eigen/src/Core/Block.h
-		../../extern/Eigen3/Eigen/src/Core/BooleanRedux.h
-		../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h
-		../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
-		../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
-		../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
-		../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
-		../../extern/Eigen3/Eigen/src/Core/DenseBase.h
-		../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
-		../../extern/Eigen3/Eigen/src/Core/DenseStorage.h
-		../../extern/Eigen3/Eigen/src/Core/Diagonal.h
-		../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
-		../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
-		../../extern/Eigen3/Eigen/src/Core/Dot.h
-		../../extern/Eigen3/Eigen/src/Core/EigenBase.h
-		../../extern/Eigen3/Eigen/src/Core/Flagged.h
-		../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
-		../../extern/Eigen3/Eigen/src/Core/Functors.h
-		../../extern/Eigen3/Eigen/src/Core/Fuzzy.h
-		../../extern/Eigen3/Eigen/src/Core/GeneralProduct.h
-		../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
-		../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
-		../../extern/Eigen3/Eigen/src/Core/IO.h
-		../../extern/Eigen3/Eigen/src/Core/Map.h
-		../../extern/Eigen3/Eigen/src/Core/MapBase.h
-		../../extern/Eigen3/Eigen/src/Core/MathFunctions.h
-		../../extern/Eigen3/Eigen/src/Core/Matrix.h
-		../../extern/Eigen3/Eigen/src/Core/MatrixBase.h
-		../../extern/Eigen3/Eigen/src/Core/NestByValue.h
-		../../extern/Eigen3/Eigen/src/Core/NoAlias.h
-		../../extern/Eigen3/Eigen/src/Core/NumTraits.h
-		../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
-		../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
-		../../extern/Eigen3/Eigen/src/Core/Product.h
-		../../extern/Eigen3/Eigen/src/Core/ProductBase.h
-		../../extern/Eigen3/Eigen/src/Core/Random.h
-		../../extern/Eigen3/Eigen/src/Core/Redux.h
-		../../extern/Eigen3/Eigen/src/Core/Replicate.h
-		../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h
-		../../extern/Eigen3/Eigen/src/Core/Reverse.h
-		../../extern/Eigen3/Eigen/src/Core/Select.h
-		../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
-		../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
-		../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h
-		../../extern/Eigen3/Eigen/src/Core/StableNorm.h
-		../../extern/Eigen3/Eigen/src/Core/Stride.h
-		../../extern/Eigen3/Eigen/src/Core/Swap.h
-		../../extern/Eigen3/Eigen/src/Core/Transpose.h
-		../../extern/Eigen3/Eigen/src/Core/Transpositions.h
-		../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
-		../../extern/Eigen3/Eigen/src/Core/VectorBlock.h
-		../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
-		../../extern/Eigen3/Eigen/src/Core/Visitor.h
-		../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
-		../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
-		../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h
-		../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
-		../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
-		../../extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h
-		../../extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
-		../../extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
-		../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
-		../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
-		../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
-		../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
-		../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_MKL.h
-		../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h
-		../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
-		../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector_MKL.h
-		../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
-		../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
-		../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix_MKL.h
-		../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
-		../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector_MKL.h
-		../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
-		../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
-		../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
-		../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h
-		../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
-		../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector_MKL.h
-		../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
-		../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h
-		../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
-		../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
-		../../extern/Eigen3/Eigen/src/Core/util/Constants.h
-		../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
-		../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
-		../../extern/Eigen3/Eigen/src/Core/util/Macros.h
-		../../extern/Eigen3/Eigen/src/Core/util/Memory.h
-		../../extern/Eigen3/Eigen/src/Core/util/Meta.h
-		../../extern/Eigen3/Eigen/src/Core/util/MKL_support.h
-		../../extern/Eigen3/Eigen/src/Core/util/NonMPL2.h
-		../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
-		../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
-		../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
-		../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
-		../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
-		../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
-		../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur_MKL.h
-		../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
-		../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
-		../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
-		../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
-		../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
-		../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur_MKL.h
-		../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
-		../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h
-		../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
-		../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
-		../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
-		../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
-		../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
-		../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
-		../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
-		../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
-		../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h
-		../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
-		../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h
-		../../extern/Eigen3/Eigen/src/Geometry/Scaling.h
-		../../extern/Eigen3/Eigen/src/Geometry/Transform.h
-		../../extern/Eigen3/Eigen/src/Geometry/Translation.h
-		../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h
-		../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
-		../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
-		../../extern/Eigen3/Eigen/src/Householder/Householder.h
-		../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
-		../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h
-		../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h
-		../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h
-		../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h
-		../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h
-		../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
-		../../extern/Eigen3/Eigen/src/LU/Determinant.h
-		../../extern/Eigen3/Eigen/src/LU/FullPivLU.h
-		../../extern/Eigen3/Eigen/src/LU/Inverse.h
-		../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h
-		../../extern/Eigen3/Eigen/src/LU/PartialPivLU_MKL.h
-		../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
-		../../extern/Eigen3/Eigen/src/misc/blas.h
-		../../extern/Eigen3/Eigen/src/misc/Image.h
-		../../extern/Eigen3/Eigen/src/misc/Kernel.h
-		../../extern/Eigen3/Eigen/src/misc/Solve.h
-		../../extern/Eigen3/Eigen/src/misc/SparseSolve.h
-		../../extern/Eigen3/Eigen/src/OrderingMethods/Amd.h
-		../../extern/Eigen3/Eigen/src/PardisoSupport/PardisoSupport.h
-		../../extern/Eigen3/Eigen/src/PaStiXSupport/PaStiXSupport.h
-		../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
-		../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
-		../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h
-		../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
-		../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
-		../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
-		../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
-		../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
-		../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR_MKL.h
-		../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
-		../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h
-		../../extern/Eigen3/Eigen/src/QR/HouseholderQR_MKL.h
-		../../extern/Eigen3/Eigen/src/SparseCholesky/SimplicialCholesky.h
-		../../extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h
-		../../extern/Eigen3/Eigen/src/SparseCore/CompressedStorage.h
-		../../extern/Eigen3/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h
-		../../extern/Eigen3/Eigen/src/SparseCore/CoreIterators.h
-		../../extern/Eigen3/Eigen/src/SparseCore/MappedSparseMatrix.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseAssign.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseBlock.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseBinaryOp.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseUnaryOp.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseDenseProduct.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseDiagonalProduct.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseDot.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseFuzzy.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrix.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrixBase.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparsePermutation.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseProduct.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseRedux.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseSparseProductWithPruning.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseTranspose.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseTriangularView.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseUtil.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseVector.h
-		../../extern/Eigen3/Eigen/src/SparseCore/SparseView.h
-		../../extern/Eigen3/Eigen/src/SparseCore/TriangularSolver.h
-		../../extern/Eigen3/Eigen/src/StlSupport/details.h
-		../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h
-		../../extern/Eigen3/Eigen/src/StlSupport/StdList.h
-		../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h
-		../../extern/Eigen3/Eigen/src/SuperLUSupport/SuperLUSupport.h
-		../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
-		../../extern/Eigen3/Eigen/src/SVD/JacobiSVD_MKL.h
-		../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
-		../../extern/Eigen3/Eigen/src/UmfPackSupport/UmfPackSupport.h
-	)
+  set(EIGEN3_HEADERS
+    # until we have another user...
+    ../../extern/Eigen3/Eigen/src/Cholesky/LDLT.h
+    ../../extern/Eigen3/Eigen/src/Cholesky/LLT.h
+    ../../extern/Eigen3/Eigen/src/Cholesky/LLT_MKL.h
+    ../../extern/Eigen3/Eigen/src/CholmodSupport/CholmodSupport.h
+    ../../extern/Eigen3/Eigen/src/Core/Array.h
+    ../../extern/Eigen3/Eigen/src/Core/ArrayBase.h
+    ../../extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
+    ../../extern/Eigen3/Eigen/src/Core/Assign.h
+    ../../extern/Eigen3/Eigen/src/Core/Assign_MKL.h
+    ../../extern/Eigen3/Eigen/src/Core/BandMatrix.h
+    ../../extern/Eigen3/Eigen/src/Core/Block.h
+    ../../extern/Eigen3/Eigen/src/Core/BooleanRedux.h
+    ../../extern/Eigen3/Eigen/src/Core/CommaInitializer.h
+    ../../extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
+    ../../extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
+    ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
+    ../../extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
+    ../../extern/Eigen3/Eigen/src/Core/DenseBase.h
+    ../../extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
+    ../../extern/Eigen3/Eigen/src/Core/DenseStorage.h
+    ../../extern/Eigen3/Eigen/src/Core/Diagonal.h
+    ../../extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
+    ../../extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
+    ../../extern/Eigen3/Eigen/src/Core/Dot.h
+    ../../extern/Eigen3/Eigen/src/Core/EigenBase.h
+    ../../extern/Eigen3/Eigen/src/Core/Flagged.h
+    ../../extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
+    ../../extern/Eigen3/Eigen/src/Core/Functors.h
+    ../../extern/Eigen3/Eigen/src/Core/Fuzzy.h
+    ../../extern/Eigen3/Eigen/src/Core/GeneralProduct.h
+    ../../extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
+    ../../extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
+    ../../extern/Eigen3/Eigen/src/Core/IO.h
+    ../../extern/Eigen3/Eigen/src/Core/Map.h
+    ../../extern/Eigen3/Eigen/src/Core/MapBase.h
+    ../../extern/Eigen3/Eigen/src/Core/MathFunctions.h
+    ../../extern/Eigen3/Eigen/src/Core/Matrix.h
+    ../../extern/Eigen3/Eigen/src/Core/MatrixBase.h
+    ../../extern/Eigen3/Eigen/src/Core/NestByValue.h
+    ../../extern/Eigen3/Eigen/src/Core/NoAlias.h
+    ../../extern/Eigen3/Eigen/src/Core/NumTraits.h
+    ../../extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
+    ../../extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
+    ../../extern/Eigen3/Eigen/src/Core/Product.h
+    ../../extern/Eigen3/Eigen/src/Core/ProductBase.h
+    ../../extern/Eigen3/Eigen/src/Core/Random.h
+    ../../extern/Eigen3/Eigen/src/Core/Redux.h
+    ../../extern/Eigen3/Eigen/src/Core/Replicate.h
+    ../../extern/Eigen3/Eigen/src/Core/ReturnByValue.h
+    ../../extern/Eigen3/Eigen/src/Core/Reverse.h
+    ../../extern/Eigen3/Eigen/src/Core/Select.h
+    ../../extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
+    ../../extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
+    ../../extern/Eigen3/Eigen/src/Core/SolveTriangular.h
+    ../../extern/Eigen3/Eigen/src/Core/StableNorm.h
+    ../../extern/Eigen3/Eigen/src/Core/Stride.h
+    ../../extern/Eigen3/Eigen/src/Core/Swap.h
+    ../../extern/Eigen3/Eigen/src/Core/Transpose.h
+    ../../extern/Eigen3/Eigen/src/Core/Transpositions.h
+    ../../extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
+    ../../extern/Eigen3/Eigen/src/Core/VectorBlock.h
+    ../../extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
+    ../../extern/Eigen3/Eigen/src/Core/Visitor.h
+    ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
+    ../../extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
+    ../../extern/Eigen3/Eigen/src/Core/arch/Default/Settings.h
+    ../../extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
+    ../../extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
+    ../../extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h
+    ../../extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
+    ../../extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
+    ../../extern/Eigen3/Eigen/src/Core/products/CoeffBasedProduct.h
+    ../../extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
+    ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
+    ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
+    ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_MKL.h
+    ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix_MKL.h
+    ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
+    ../../extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector_MKL.h
+    ../../extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
+    ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
+    ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix_MKL.h
+    ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
+    ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector_MKL.h
+    ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
+    ../../extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
+    ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
+    ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_MKL.h
+    ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
+    ../../extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector_MKL.h
+    ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
+    ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix_MKL.h
+    ../../extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
+    ../../extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
+    ../../extern/Eigen3/Eigen/src/Core/util/Constants.h
+    ../../extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
+    ../../extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
+    ../../extern/Eigen3/Eigen/src/Core/util/Macros.h
+    ../../extern/Eigen3/Eigen/src/Core/util/Memory.h
+    ../../extern/Eigen3/Eigen/src/Core/util/Meta.h
+    ../../extern/Eigen3/Eigen/src/Core/util/MKL_support.h
+    ../../extern/Eigen3/Eigen/src/Core/util/NonMPL2.h
+    ../../extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
+    ../../extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
+    ../../extern/Eigen3/Eigen/src/Core/util/XprHelper.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Block.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Cwise.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/CwiseOperators.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Lazy.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/LeastSquares.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/LU.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Macros.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/MathFunctions.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Memory.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Meta.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Minor.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/QR.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/SVD.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/TriangularSolver.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/VectorBlock.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AlignedBox.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/All.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/AngleAxis.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Hyperplane.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/ParametrizedLine.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Quaternion.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Rotation2D.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/RotationBase.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Scaling.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Transform.h
+    ../../extern/Eigen3/Eigen/src/Eigen2Support/Geometry/Translation.h
+    ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
+    ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
+    ../../extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur_MKL.h
+    ../../extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
+    ../../extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
+    ../../extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
+    ../../extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
+    ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
+    ../../extern/Eigen3/Eigen/src/Eigenvalues/RealSchur_MKL.h
+    ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
+    ../../extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_MKL.h
+    ../../extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
+    ../../extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
+    ../../extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
+    ../../extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
+    ../../extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
+    ../../extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
+    ../../extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
+    ../../extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
+    ../../extern/Eigen3/Eigen/src/Geometry/Quaternion.h
+    ../../extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
+    ../../extern/Eigen3/Eigen/src/Geometry/RotationBase.h
+    ../../extern/Eigen3/Eigen/src/Geometry/Scaling.h
+    ../../extern/Eigen3/Eigen/src/Geometry/Transform.h
+    ../../extern/Eigen3/Eigen/src/Geometry/Translation.h
+    ../../extern/Eigen3/Eigen/src/Geometry/Umeyama.h
+    ../../extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
+    ../../extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
+    ../../extern/Eigen3/Eigen/src/Householder/Householder.h
+    ../../extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
+    ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h
+    ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h
+    ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h
+    ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h
+    ../../extern/Eigen3/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h
+    ../../extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
+    ../../extern/Eigen3/Eigen/src/LU/Determinant.h
+    ../../extern/Eigen3/Eigen/src/LU/FullPivLU.h
+    ../../extern/Eigen3/Eigen/src/LU/Inverse.h
+    ../../extern/Eigen3/Eigen/src/LU/PartialPivLU.h
+    ../../extern/Eigen3/Eigen/src/LU/PartialPivLU_MKL.h
+    ../../extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
+    ../../extern/Eigen3/Eigen/src/misc/blas.h
+    ../../extern/Eigen3/Eigen/src/misc/Image.h
+    ../../extern/Eigen3/Eigen/src/misc/Kernel.h
+    ../../extern/Eigen3/Eigen/src/misc/Solve.h
+    ../../extern/Eigen3/Eigen/src/misc/SparseSolve.h
+    ../../extern/Eigen3/Eigen/src/OrderingMethods/Amd.h
+    ../../extern/Eigen3/Eigen/src/PardisoSupport/PardisoSupport.h
+    ../../extern/Eigen3/Eigen/src/PaStiXSupport/PaStiXSupport.h
+    ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
+    ../../extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
+    ../../extern/Eigen3/Eigen/src/plugins/BlockMethods.h
+    ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
+    ../../extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
+    ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
+    ../../extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
+    ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
+    ../../extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR_MKL.h
+    ../../extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
+    ../../extern/Eigen3/Eigen/src/QR/HouseholderQR.h
+    ../../extern/Eigen3/Eigen/src/QR/HouseholderQR_MKL.h
+    ../../extern/Eigen3/Eigen/src/SparseCholesky/SimplicialCholesky.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/CompressedStorage.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/CoreIterators.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/MappedSparseMatrix.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseAssign.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseBlock.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseBinaryOp.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseCwiseUnaryOp.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseDenseProduct.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseDiagonalProduct.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseDot.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseFuzzy.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrix.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseMatrixBase.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparsePermutation.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseProduct.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseRedux.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseSparseProductWithPruning.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseTranspose.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseTriangularView.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseUtil.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseVector.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/SparseView.h
+    ../../extern/Eigen3/Eigen/src/SparseCore/TriangularSolver.h
+    ../../extern/Eigen3/Eigen/src/StlSupport/details.h
+    ../../extern/Eigen3/Eigen/src/StlSupport/StdDeque.h
+    ../../extern/Eigen3/Eigen/src/StlSupport/StdList.h
+    ../../extern/Eigen3/Eigen/src/StlSupport/StdVector.h
+    ../../extern/Eigen3/Eigen/src/SuperLUSupport/SuperLUSupport.h
+    ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
+    ../../extern/Eigen3/Eigen/src/SVD/JacobiSVD_MKL.h
+    ../../extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
+    ../../extern/Eigen3/Eigen/src/UmfPackSupport/UmfPackSupport.h
+  )
 endif()
 
 set(SRC
-	Armature.cpp
-	Cache.cpp
-	ConstraintSet.cpp
-	ControlledObject.cpp
-	CopyPose.cpp
-	Distance.cpp
-	FixedObject.cpp
-	MovingFrame.cpp
-	Scene.cpp
-	UncontrolledObject.cpp
-	WDLSSolver.cpp
-	WSDLSSolver.cpp
-	WorldObject.cpp
-	eigen_types.cpp
-	ublas_types.hpp
+  Armature.cpp
+  Cache.cpp
+  ConstraintSet.cpp
+  ControlledObject.cpp
+  CopyPose.cpp
+  Distance.cpp
+  FixedObject.cpp
+  MovingFrame.cpp
+  Scene.cpp
+  UncontrolledObject.cpp
+  WDLSSolver.cpp
+  WSDLSSolver.cpp
+  WorldObject.cpp
+  eigen_types.cpp
+  ublas_types.hpp
 
-	kdl/chain.cpp
-	kdl/chainfksolverpos_recursive.cpp
-	kdl/chainjnttojacsolver.cpp
-	kdl/frameacc.cpp
-	kdl/frames.cpp
-	kdl/frames_io.cpp
-	kdl/framevel.cpp
-	kdl/inertia.cpp
-	kdl/jacobian.cpp
-	kdl/jntarray.cpp
-	kdl/jntarrayacc.cpp
-	kdl/jntarrayvel.cpp
-	kdl/joint.cpp
-	kdl/kinfam_io.cpp
-	kdl/segment.cpp
-	kdl/tree.cpp
-	kdl/treefksolverpos_recursive.cpp
-	kdl/treejnttojacsolver.cpp
-	kdl/utilities/error_stack.cpp
-	kdl/utilities/utility.cpp
-	kdl/utilities/utility_io.cpp
+  kdl/chain.cpp
+  kdl/chainfksolverpos_recursive.cpp
+  kdl/chainjnttojacsolver.cpp
+  kdl/frameacc.cpp
+  kdl/frames.cpp
+  kdl/frames_io.cpp
+  kdl/framevel.cpp
+  kdl/inertia.cpp
+  kdl/jacobian.cpp
+  kdl/jntarray.cpp
+  kdl/jntarrayacc.cpp
+  kdl/jntarrayvel.cpp
+  kdl/joint.cpp
+  kdl/kinfam_io.cpp
+  kdl/segment.cpp
+  kdl/tree.cpp
+  kdl/treefksolverpos_recursive.cpp
+  kdl/treejnttojacsolver.cpp
+  kdl/utilities/error_stack.cpp
+  kdl/utilities/utility.cpp
+  kdl/utilities/utility_io.cpp
 
-	Armature.hpp
-	Cache.hpp
-	ConstraintSet.hpp
-	ControlledObject.hpp
-	CopyPose.hpp
-	Distance.hpp
-	FixedObject.hpp
-	MovingFrame.hpp
-	Object.hpp
-	Scene.hpp
-	Solver.hpp
-	UncontrolledObject.hpp
-	WDLSSolver.hpp
-	WSDLSSolver.hpp
-	WorldObject.hpp
-	eigen_types.hpp
-	kdl/chain.hpp
-	kdl/chainfksolver.hpp
-	kdl/chainfksolverpos_recursive.hpp
-	kdl/chainjnttojacsolver.hpp
-	kdl/frameacc.hpp
-	kdl/frames.hpp
-	kdl/frames_io.hpp
-	kdl/framevel.hpp
-	kdl/inertia.hpp
-	kdl/jacobian.hpp
-	kdl/jntarray.hpp
-	kdl/jntarrayacc.hpp
-	kdl/jntarrayvel.hpp
-	kdl/joint.hpp
-	kdl/kinfam_io.hpp
-	kdl/segment.hpp
-	kdl/tree.hpp
-	kdl/treefksolver.hpp
-	kdl/treefksolverpos_recursive.hpp
-	kdl/treejnttojacsolver.hpp
-	kdl/utilities/error.h
-	kdl/utilities/error_stack.h
-	kdl/utilities/kdl-config.h
-	kdl/utilities/rall1d.h
-	kdl/utilities/rall2d.h
-	kdl/utilities/svd_eigen_HH.hpp
-	kdl/utilities/traits.h
-	kdl/utilities/utility.h
-	kdl/utilities/utility_io.h
+  Armature.hpp
+  Cache.hpp
+  ConstraintSet.hpp
+  ControlledObject.hpp
+  CopyPose.hpp
+  Distance.hpp
+  FixedObject.hpp
+  MovingFrame.hpp
+  Object.hpp
+  Scene.hpp
+  Solver.hpp
+  UncontrolledObject.hpp
+  WDLSSolver.hpp
+  WSDLSSolver.hpp
+  WorldObject.hpp
+  eigen_types.hpp
+  kdl/chain.hpp
+  kdl/chainfksolver.hpp
+  kdl/chainfksolverpos_recursive.hpp
+  kdl/chainjnttojacsolver.hpp
+  kdl/frameacc.hpp
+  kdl/frames.hpp
+  kdl/frames_io.hpp
+  kdl/framevel.hpp
+  kdl/inertia.hpp
+  kdl/jacobian.hpp
+  kdl/jntarray.hpp
+  kdl/jntarrayacc.hpp
+  kdl/jntarrayvel.hpp
+  kdl/joint.hpp
+  kdl/kinfam_io.hpp
+  kdl/segment.hpp
+  kdl/tree.hpp
+  kdl/treefksolver.hpp
+  kdl/treefksolverpos_recursive.hpp
+  kdl/treejnttojacsolver.hpp
+  kdl/utilities/error.h
+  kdl/utilities/error_stack.h
+  kdl/utilities/kdl-config.h
+  kdl/utilities/rall1d.h
+  kdl/utilities/rall2d.h
+  kdl/utilities/svd_eigen_HH.hpp
+  kdl/utilities/traits.h
+  kdl/utilities/utility.h
+  kdl/utilities/utility_io.h
 
-	kdl/frameacc.inl
-	kdl/frames.inl
-	kdl/framevel.inl
+  kdl/frameacc.inl
+  kdl/frames.inl
+  kdl/framevel.inl
 
-	${EIGEN3_HEADERS}
+  ${EIGEN3_HEADERS}
 )
 
 set(LIB
diff --git a/intern/libmv/CMakeLists.txt b/intern/libmv/CMakeLists.txt
index 67bf0de98b0..019364d84df 100644
--- a/intern/libmv/CMakeLists.txt
+++ b/intern/libmv/CMakeLists.txt
@@ -23,14 +23,14 @@
 #       in that script too
 
 set(INC
-	.
+  .
 )
 
 set(INC_SYS
 )
 
 set(SRC
-	libmv-capi.h
+  libmv-capi.h
 )
 
 set(LIB
@@ -38,207 +38,207 @@ set(LIB
 )
 
 if(WITH_LIBMV)
-	add_definitions(${GFLAGS_DEFINES})
-	add_definitions(${GLOG_DEFINES})
-	add_definitions(${CERES_DEFINES})
-	add_definitions(-DLIBMV_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE})
-
-	list(APPEND INC
-		${GFLAGS_INCLUDE_DIRS}
-		${GLOG_INCLUDE_DIRS}
-		../../extern/ceres/include
-		../../extern/ceres/config
-		../guardedalloc
-	)
-
-	list(APPEND INC_SYS
-		${EIGEN3_INCLUDE_DIRS}
-		${PNG_INCLUDE_DIRS}
-		${ZLIB_INCLUDE_DIRS}
-	)
-
-	list(APPEND LIB
-		extern_ceres
-		extern_glog
-	)
-
-	add_definitions(
-		-DWITH_LIBMV_GUARDED_ALLOC
-		-DLIBMV_NO_FAST_DETECTOR=
-	)
-
-	list(APPEND SRC
-		intern/autotrack.cc
-		intern/camera_intrinsics.cc
-		intern/detector.cc
-		intern/frame_accessor.cc
-		intern/homography.cc
-		intern/image.cc
-		intern/logging.cc
-		intern/reconstruction.cc
-		intern/track_region.cc
-		intern/tracks.cc
-		intern/tracksN.cc
-		libmv/autotrack/autotrack.cc
-		libmv/autotrack/predict_tracks.cc
-		libmv/autotrack/tracks.cc
-		libmv/base/aligned_malloc.cc
-		libmv/image/array_nd.cc
-		libmv/image/convolve.cc
-		libmv/multiview/conditioning.cc
-		libmv/multiview/euclidean_resection.cc
-		libmv/multiview/fundamental.cc
-		libmv/multiview/homography.cc
-		libmv/multiview/panography.cc
-		libmv/multiview/panography_kernel.cc
-		libmv/multiview/projection.cc
-		libmv/multiview/triangulation.cc
-		libmv/numeric/numeric.cc
-		libmv/numeric/poly.cc
-		libmv/simple_pipeline/bundle.cc
-		libmv/simple_pipeline/camera_intrinsics.cc
-		libmv/simple_pipeline/detect.cc
-		libmv/simple_pipeline/distortion_models.cc
-		libmv/simple_pipeline/initialize_reconstruction.cc
-		libmv/simple_pipeline/intersect.cc
-		libmv/simple_pipeline/keyframe_selection.cc
-		libmv/simple_pipeline/modal_solver.cc
-		libmv/simple_pipeline/pipeline.cc
-		libmv/simple_pipeline/reconstruction.cc
-		libmv/simple_pipeline/reconstruction_scale.cc
-		libmv/simple_pipeline/resect.cc
-		libmv/simple_pipeline/tracks.cc
-		libmv/tracking/brute_region_tracker.cc
-		libmv/tracking/hybrid_region_tracker.cc
-		libmv/tracking/klt_region_tracker.cc
-		libmv/tracking/pyramid_region_tracker.cc
-		libmv/tracking/retrack_region_tracker.cc
-		libmv/tracking/track_region.cc
-		libmv/tracking/trklt_region_tracker.cc
-
-
-		intern/autotrack.h
-		intern/camera_intrinsics.h
-		intern/detector.h
-		intern/frame_accessor.h
-		intern/homography.h
-		intern/image.h
-		intern/logging.h
-		intern/reconstruction.h
-		intern/track_region.h
-		intern/tracks.h
-		intern/tracksN.h
-		libmv/autotrack/autotrack.h
-		libmv/autotrack/callbacks.h
-		libmv/autotrack/frame_accessor.h
-		libmv/autotrack/marker.h
-		libmv/autotrack/model.h
-		libmv/autotrack/predict_tracks.h
-		libmv/autotrack/quad.h
-		libmv/autotrack/reconstruction.h
-		libmv/autotrack/region.h
-		libmv/autotrack/tracks.h
-		libmv/base/aligned_malloc.h
-		libmv/base/id_generator.h
-		libmv/base/scoped_ptr.h
-		libmv/base/vector.h
-		libmv/base/vector_utils.h
-		libmv/image/array_nd.h
-		libmv/image/convolve.h
-		libmv/image/correlation.h
-		libmv/image/image_converter.h
-		libmv/image/image_drawing.h
-		libmv/image/image.h
-		libmv/image/sample.h
-		libmv/image/tuple.h
-		libmv/logging/logging.h
-		libmv/multiview/conditioning.h
-		libmv/multiview/euclidean_resection.h
-		libmv/multiview/fundamental.h
-		libmv/multiview/homography_error.h
-		libmv/multiview/homography.h
-		libmv/multiview/homography_parameterization.h
-		libmv/multiview/nviewtriangulation.h
-		libmv/multiview/panography.h
-		libmv/multiview/panography_kernel.h
-		libmv/multiview/projection.h
-		libmv/multiview/resection.h
-		libmv/multiview/triangulation.h
-		libmv/multiview/two_view_kernel.h
-		libmv/numeric/dogleg.h
-		libmv/numeric/function_derivative.h
-		libmv/numeric/levenberg_marquardt.h
-		libmv/numeric/numeric.h
-		libmv/numeric/poly.h
-		libmv/simple_pipeline/bundle.h
-		libmv/simple_pipeline/callbacks.h
-		libmv/simple_pipeline/camera_intrinsics.h
-		libmv/simple_pipeline/camera_intrinsics_impl.h
-		libmv/simple_pipeline/detect.h
-		libmv/simple_pipeline/distortion_models.h
-		libmv/simple_pipeline/initialize_reconstruction.h
-		libmv/simple_pipeline/intersect.h
-		libmv/simple_pipeline/keyframe_selection.h
-		libmv/simple_pipeline/modal_solver.h
-		libmv/simple_pipeline/pipeline.h
-		libmv/simple_pipeline/reconstruction.h
-		libmv/simple_pipeline/reconstruction_scale.h
-		libmv/simple_pipeline/resect.h
-		libmv/simple_pipeline/tracks.h
-		libmv/tracking/brute_region_tracker.h
-		libmv/tracking/hybrid_region_tracker.h
-		libmv/tracking/kalman_filter.h
-		libmv/tracking/klt_region_tracker.h
-		libmv/tracking/pyramid_region_tracker.h
-		libmv/tracking/region_tracker.h
-		libmv/tracking/retrack_region_tracker.h
-		libmv/tracking/track_region.h
-		libmv/tracking/trklt_region_tracker.h
-
-		third_party/msinttypes/inttypes.h
-		third_party/msinttypes/stdint.h
-	)
-
-
-	if(WITH_GTESTS)
-		blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "" "" "")
-
-		BLENDER_SRC_GTEST("libmv_predict_tracks" "./libmv/autotrack/predict_tracks_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_tracks" "./libmv/autotrack/tracks_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_scoped_ptr" "./libmv/base/scoped_ptr_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_vector" "./libmv/base/vector_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_array_nd" "./libmv/image/array_nd_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_convolve" "./libmv/image/convolve_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_image" "./libmv/image/image_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_sample" "./libmv/image/sample_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_tuple" "./libmv/image/tuple_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_euclidean_resection" "./libmv/multiview/euclidean_resection_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_fundamental" "./libmv/multiview/fundamental_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_homography" "./libmv/multiview/homography_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_nviewtriangulation" "./libmv/multiview/nviewtriangulation_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_panography" "./libmv/multiview/panography_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_projection" "./libmv/multiview/projection_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_resection" "./libmv/multiview/resection_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_triangulation" "./libmv/multiview/triangulation_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_dogleg" "./libmv/numeric/dogleg_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_function_derivative" "./libmv/numeric/function_derivative_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_levenberg_marquardt" "./libmv/numeric/levenberg_marquardt_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_numeric" "./libmv/numeric/numeric_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_poly" "./libmv/numeric/poly_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_camera_intrinsics" "./libmv/simple_pipeline/camera_intrinsics_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_detect" "./libmv/simple_pipeline/detect_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_intersect" "./libmv/simple_pipeline/intersect_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_keyframe_selection" "./libmv/simple_pipeline/keyframe_selection_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_modal_solver" "./libmv/simple_pipeline/modal_solver_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_resect" "./libmv/simple_pipeline/resect_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_brute_region_tracker" "./libmv/tracking/brute_region_tracker_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_klt_region_tracker" "./libmv/tracking/klt_region_tracker_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-		BLENDER_SRC_GTEST("libmv_pyramid_region_tracker" "./libmv/tracking/pyramid_region_tracker_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
-	endif()
+  add_definitions(${GFLAGS_DEFINES})
+  add_definitions(${GLOG_DEFINES})
+  add_definitions(${CERES_DEFINES})
+  add_definitions(-DLIBMV_GFLAGS_NAMESPACE=${GFLAGS_NAMESPACE})
+
+  list(APPEND INC
+    ${GFLAGS_INCLUDE_DIRS}
+    ${GLOG_INCLUDE_DIRS}
+    ../../extern/ceres/include
+    ../../extern/ceres/config
+    ../guardedalloc
+  )
+
+  list(APPEND INC_SYS
+    ${EIGEN3_INCLUDE_DIRS}
+    ${PNG_INCLUDE_DIRS}
+    ${ZLIB_INCLUDE_DIRS}
+  )
+
+  list(APPEND LIB
+    extern_ceres
+    extern_glog
+  )
+
+  add_definitions(
+    -DWITH_LIBMV_GUARDED_ALLOC
+    -DLIBMV_NO_FAST_DETECTOR=
+  )
+
+  list(APPEND SRC
+    intern/autotrack.cc
+    intern/camera_intrinsics.cc
+    intern/detector.cc
+    intern/frame_accessor.cc
+    intern/homography.cc
+    intern/image.cc
+    intern/logging.cc
+    intern/reconstruction.cc
+    intern/track_region.cc
+    intern/tracks.cc
+    intern/tracksN.cc
+    libmv/autotrack/autotrack.cc
+    libmv/autotrack/predict_tracks.cc
+    libmv/autotrack/tracks.cc
+    libmv/base/aligned_malloc.cc
+    libmv/image/array_nd.cc
+    libmv/image/convolve.cc
+    libmv/multiview/conditioning.cc
+    libmv/multiview/euclidean_resection.cc
+    libmv/multiview/fundamental.cc
+    libmv/multiview/homography.cc
+    libmv/multiview/panography.cc
+    libmv/multiview/panography_kernel.cc
+    libmv/multiview/projection.cc
+    libmv/multiview/triangulation.cc
+    libmv/numeric/numeric.cc
+    libmv/numeric/poly.cc
+    libmv/simple_pipeline/bundle.cc
+    libmv/simple_pipeline/camera_intrinsics.cc
+    libmv/simple_pipeline/detect.cc
+    libmv/simple_pipeline/distortion_models.cc
+    libmv/simple_pipeline/initialize_reconstruction.cc
+    libmv/simple_pipeline/intersect.cc
+    libmv/simple_pipeline/keyframe_selection.cc
+    libmv/simple_pipeline/modal_solver.cc
+    libmv/simple_pipeline/pipeline.cc
+    libmv/simple_pipeline/reconstruction.cc
+    libmv/simple_pipeline/reconstruction_scale.cc
+    libmv/simple_pipeline/resect.cc
+    libmv/simple_pipeline/tracks.cc
+    libmv/tracking/brute_region_tracker.cc
+    libmv/tracking/hybrid_region_tracker.cc
+    libmv/tracking/klt_region_tracker.cc
+    libmv/tracking/pyramid_region_tracker.cc
+    libmv/tracking/retrack_region_tracker.cc
+    libmv/tracking/track_region.cc
+    libmv/tracking/trklt_region_tracker.cc
+
+
+    intern/autotrack.h
+    intern/camera_intrinsics.h
+    intern/detector.h
+    intern/frame_accessor.h
+    intern/homography.h
+    intern/image.h
+    intern/logging.h
+    intern/reconstruction.h
+    intern/track_region.h
+    intern/tracks.h
+    intern/tracksN.h
+    libmv/autotrack/autotrack.h
+    libmv/autotrack/callbacks.h
+    libmv/autotrack/frame_accessor.h
+    libmv/autotrack/marker.h
+    libmv/autotrack/model.h
+    libmv/autotrack/predict_tracks.h
+    libmv/autotrack/quad.h
+    libmv/autotrack/reconstruction.h
+    libmv/autotrack/region.h
+    libmv/autotrack/tracks.h
+    libmv/base/aligned_malloc.h
+    libmv/base/id_generator.h
+    libmv/base/scoped_ptr.h
+    libmv/base/vector.h
+    libmv/base/vector_utils.h
+    libmv/image/array_nd.h
+    libmv/image/convolve.h
+    libmv/image/correlation.h
+    libmv/image/image_converter.h
+    libmv/image/image_drawing.h
+    libmv/image/image.h
+    libmv/image/sample.h
+    libmv/image/tuple.h
+    libmv/logging/logging.h
+    libmv/multiview/conditioning.h
+    libmv/multiview/euclidean_resection.h
+    libmv/multiview/fundamental.h
+    libmv/multiview/homography_error.h
+    libmv/multiview/homography.h
+    libmv/multiview/homography_parameterization.h
+    libmv/multiview/nviewtriangulation.h
+    libmv/multiview/panography.h
+    libmv/multiview/panography_kernel.h
+    libmv/multiview/projection.h
+    libmv/multiview/resection.h
+    libmv/multiview/triangulation.h
+    libmv/multiview/two_view_kernel.h
+    libmv/numeric/dogleg.h
+    libmv/numeric/function_derivative.h
+    libmv/numeric/levenberg_marquardt.h
+    libmv/numeric/numeric.h
+    libmv/numeric/poly.h
+    libmv/simple_pipeline/bundle.h
+    libmv/simple_pipeline/callbacks.h
+    libmv/simple_pipeline/camera_intrinsics.h
+    libmv/simple_pipeline/camera_intrinsics_impl.h
+    libmv/simple_pipeline/detect.h
+    libmv/simple_pipeline/distortion_models.h
+    libmv/simple_pipeline/initialize_reconstruction.h
+    libmv/simple_pipeline/intersect.h
+    libmv/simple_pipeline/keyframe_selection.h
+    libmv/simple_pipeline/modal_solver.h
+    libmv/simple_pipeline/pipeline.h
+    libmv/simple_pipeline/reconstruction.h
+    libmv/simple_pipeline/reconstruction_scale.h
+    libmv/simple_pipeline/resect.h
+    libmv/simple_pipeline/tracks.h
+    libmv/tracking/brute_region_tracker.h
+    libmv/tracking/hybrid_region_tracker.h
+    libmv/tracking/kalman_filter.h
+    libmv/tracking/klt_region_tracker.h
+    libmv/tracking/pyramid_region_tracker.h
+    libmv/tracking/region_tracker.h
+    libmv/tracking/retrack_region_tracker.h
+    libmv/tracking/track_region.h
+    libmv/tracking/trklt_region_tracker.h
+
+    third_party/msinttypes/inttypes.h
+    third_party/msinttypes/stdint.h
+  )
+
+
+  if(WITH_GTESTS)
+    blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "" "" "")
+
+    BLENDER_SRC_GTEST("libmv_predict_tracks" "./libmv/autotrack/predict_tracks_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_tracks" "./libmv/autotrack/tracks_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_scoped_ptr" "./libmv/base/scoped_ptr_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_vector" "./libmv/base/vector_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_array_nd" "./libmv/image/array_nd_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_convolve" "./libmv/image/convolve_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_image" "./libmv/image/image_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_sample" "./libmv/image/sample_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_tuple" "./libmv/image/tuple_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_euclidean_resection" "./libmv/multiview/euclidean_resection_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_fundamental" "./libmv/multiview/fundamental_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_homography" "./libmv/multiview/homography_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_nviewtriangulation" "./libmv/multiview/nviewtriangulation_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_panography" "./libmv/multiview/panography_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_projection" "./libmv/multiview/projection_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_resection" "./libmv/multiview/resection_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_triangulation" "./libmv/multiview/triangulation_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_dogleg" "./libmv/numeric/dogleg_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_function_derivative" "./libmv/numeric/function_derivative_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_levenberg_marquardt" "./libmv/numeric/levenberg_marquardt_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_numeric" "./libmv/numeric/numeric_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_poly" "./libmv/numeric/poly_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_camera_intrinsics" "./libmv/simple_pipeline/camera_intrinsics_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_detect" "./libmv/simple_pipeline/detect_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_intersect" "./libmv/simple_pipeline/intersect_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_keyframe_selection" "./libmv/simple_pipeline/keyframe_selection_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_modal_solver" "./libmv/simple_pipeline/modal_solver_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_resect" "./libmv/simple_pipeline/resect_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_brute_region_tracker" "./libmv/tracking/brute_region_tracker_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_klt_region_tracker" "./libmv/tracking/klt_region_tracker_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+    BLENDER_SRC_GTEST("libmv_pyramid_region_tracker" "./libmv/tracking/pyramid_region_tracker_test.cc" "libmv_test_dataset;bf_intern_libmv;extern_ceres")
+  endif()
 else()
-	list(APPEND SRC
-		intern/stub.cc
-	)
+  list(APPEND SRC
+    intern/stub.cc
+  )
 endif()
 
 blender_add_lib(bf_intern_libmv "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/intern/libmv/bundle.sh b/intern/libmv/bundle.sh
index 0c28a1c9773..08bdf491d3b 100755
--- a/intern/libmv/bundle.sh
+++ b/intern/libmv/bundle.sh
@@ -102,14 +102,14 @@ cat > CMakeLists.txt << EOF
 #       in that script too
 
 set(INC
-	.
+  .
 )
 
 set(INC_SYS
 )
 
 set(SRC
-	libmv-capi.h
+  libmv-capi.h
 )
 
 set(LIB
@@ -117,76 +117,76 @@ set(LIB
 )
 
 if(WITH_LIBMV)
-	add_definitions(\${GFLAGS_DEFINES})
-	add_definitions(\${GLOG_DEFINES})
-	add_definitions(\${CERES_DEFINES})
-	add_definitions(-DLIBMV_GFLAGS_NAMESPACE=\${GFLAGS_NAMESPACE})
-
-	list(APPEND INC
-		\${GFLAGS_INCLUDE_DIRS}
-		\${GLOG_INCLUDE_DIRS}
-		../../extern/ceres/include
-		../../extern/ceres/config
-		../guardedalloc
-	)
-
-	list(APPEND INC_SYS
-		\${EIGEN3_INCLUDE_DIRS}
-		\${PNG_INCLUDE_DIRS}
-		\${ZLIB_INCLUDE_DIRS}
-	)
-
-	list(APPEND LIB
-		extern_ceres
-		extern_glog
-	)
-
-	add_definitions(
-		-DWITH_LIBMV_GUARDED_ALLOC
-		-DLIBMV_NO_FAST_DETECTOR=
-	)
-
-	list(APPEND SRC
-		intern/autotrack.cc
-		intern/camera_intrinsics.cc
-		intern/detector.cc
-		intern/frame_accessor.cc
-		intern/homography.cc
-		intern/image.cc
-		intern/logging.cc
-		intern/reconstruction.cc
-		intern/track_region.cc
-		intern/tracks.cc
-		intern/tracksN.cc
+  add_definitions(\${GFLAGS_DEFINES})
+  add_definitions(\${GLOG_DEFINES})
+  add_definitions(\${CERES_DEFINES})
+  add_definitions(-DLIBMV_GFLAGS_NAMESPACE=\${GFLAGS_NAMESPACE})
+
+  list(APPEND INC
+    \${GFLAGS_INCLUDE_DIRS}
+    \${GLOG_INCLUDE_DIRS}
+    ../../extern/ceres/include
+    ../../extern/ceres/config
+    ../guardedalloc
+  )
+
+  list(APPEND INC_SYS
+    \${EIGEN3_INCLUDE_DIRS}
+    \${PNG_INCLUDE_DIRS}
+    \${ZLIB_INCLUDE_DIRS}
+  )
+
+  list(APPEND LIB
+    extern_ceres
+    extern_glog
+  )
+
+  add_definitions(
+    -DWITH_LIBMV_GUARDED_ALLOC
+    -DLIBMV_NO_FAST_DETECTOR=
+  )
+
+  list(APPEND SRC
+    intern/autotrack.cc
+    intern/camera_intrinsics.cc
+    intern/detector.cc
+    intern/frame_accessor.cc
+    intern/homography.cc
+    intern/image.cc
+    intern/logging.cc
+    intern/reconstruction.cc
+    intern/track_region.cc
+    intern/tracks.cc
+    intern/tracksN.cc
 ${sources}
 ${third_sources}
 
-		intern/autotrack.h
-		intern/camera_intrinsics.h
-		intern/detector.h
-		intern/frame_accessor.h
-		intern/homography.h
-		intern/image.h
-		intern/logging.h
-		intern/reconstruction.h
-		intern/track_region.h
-		intern/tracks.h
-		intern/tracksN.h
+    intern/autotrack.h
+    intern/camera_intrinsics.h
+    intern/detector.h
+    intern/frame_accessor.h
+    intern/homography.h
+    intern/image.h
+    intern/logging.h
+    intern/reconstruction.h
+    intern/track_region.h
+    intern/tracks.h
+    intern/tracksN.h
 ${headers}
 
 ${third_headers}
-	)
+  )
 
 
-	if(WITH_GTESTS)
-		blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}" "")
+  if(WITH_GTESTS)
+    blender_add_lib(libmv_test_dataset "./libmv/multiview/test_data_sets.cc" "${INC}" "${INC_SYS}" "")
 
 ${tests}
-	endif()
+  endif()
 else()
-	list(APPEND SRC
-		intern/stub.cc
-	)
+  list(APPEND SRC
+    intern/stub.cc
+  )
 endif()
 
 blender_add_lib(bf_intern_libmv "\${SRC}" "\${INC}" "\${INC_SYS}" "\${LIB}")
diff --git a/intern/numaapi/CMakeLists.txt b/intern/numaapi/CMakeLists.txt
index cc4fb27bdb7..e65ae15ae47 100644
--- a/intern/numaapi/CMakeLists.txt
+++ b/intern/numaapi/CMakeLists.txt
@@ -17,7 +17,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-	include
+  include
 )
 
 set(INC_SYS
@@ -25,13 +25,13 @@ set(INC_SYS
 )
 
 set(SRC
-	source/numaapi.c
-	source/numaapi_linux.c
-	source/numaapi_stub.c
-	source/numaapi_win32.c
+  source/numaapi.c
+  source/numaapi_linux.c
+  source/numaapi_stub.c
+  source/numaapi_win32.c
 
-	include/numaapi.h
-	source/build_config.h
+  include/numaapi.h
+  source/build_config.h
 )
 
 set(LIB
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt
index 232183fe33c..5c8e495fa93 100644
--- a/intern/smoke/CMakeLists.txt
+++ b/intern/smoke/CMakeLists.txt
@@ -19,62 +19,62 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(INC
-	intern
-	../memutil
+  intern
+  ../memutil
 )
 
 set(INC_SYS
-	${BULLET_INCLUDE_DIRS}
-	${PNG_INCLUDE_DIRS}
-	${ZLIB_INCLUDE_DIRS}
+  ${BULLET_INCLUDE_DIRS}
+  ${PNG_INCLUDE_DIRS}
+  ${ZLIB_INCLUDE_DIRS}
 )
 
 set(SRC
-	intern/EIGENVALUE_HELPER.cpp
-	intern/FLUID_3D.cpp
-	intern/FLUID_3D_SOLVERS.cpp
-	intern/FLUID_3D_STATIC.cpp
-	intern/LU_HELPER.cpp
-	intern/SPHERE.cpp
-	intern/WTURBULENCE.cpp
-	intern/smoke_API.cpp
+  intern/EIGENVALUE_HELPER.cpp
+  intern/FLUID_3D.cpp
+  intern/FLUID_3D_SOLVERS.cpp
+  intern/FLUID_3D_STATIC.cpp
+  intern/LU_HELPER.cpp
+  intern/SPHERE.cpp
+  intern/WTURBULENCE.cpp
+  intern/smoke_API.cpp
 
-	extern/smoke_API.h
-	intern/EIGENVALUE_HELPER.h
-	intern/FFT_NOISE.h
-	intern/FLUID_3D.h
-	intern/IMAGE.h
-	intern/INTERPOLATE.h
-	intern/LU_HELPER.h
-	intern/MERSENNETWISTER.h
-	intern/OBSTACLE.h
-	intern/SPHERE.h
-	intern/VEC3.h
-	intern/WAVELET_NOISE.h
-	intern/WTURBULENCE.h
-	intern/tnt/jama_eig.h
-	intern/tnt/jama_lu.h
-	intern/tnt/tnt.h
-	intern/tnt/tnt_array1d.h
-	intern/tnt/tnt_array1d_utils.h
-	intern/tnt/tnt_array2d.h
-	intern/tnt/tnt_array2d_utils.h
-	intern/tnt/tnt_array3d.h
-	intern/tnt/tnt_array3d_utils.h
-	intern/tnt/tnt_cmat.h
-	intern/tnt/tnt_fortran_array1d.h
-	intern/tnt/tnt_fortran_array1d_utils.h
-	intern/tnt/tnt_fortran_array2d.h
-	intern/tnt/tnt_fortran_array2d_utils.h
-	intern/tnt/tnt_fortran_array3d.h
-	intern/tnt/tnt_fortran_array3d_utils.h
-	intern/tnt/tnt_i_refvec.h
-	intern/tnt/tnt_math_utils.h
-	intern/tnt/tnt_sparse_matrix_csr.h
-	intern/tnt/tnt_stopwatch.h
-	intern/tnt/tnt_subscript.h
-	intern/tnt/tnt_vec.h
-	intern/tnt/tnt_version.h
+  extern/smoke_API.h
+  intern/EIGENVALUE_HELPER.h
+  intern/FFT_NOISE.h
+  intern/FLUID_3D.h
+  intern/IMAGE.h
+  intern/INTERPOLATE.h
+  intern/LU_HELPER.h
+  intern/MERSENNETWISTER.h
+  intern/OBSTACLE.h
+  intern/SPHERE.h
+  intern/VEC3.h
+  intern/WAVELET_NOISE.h
+  intern/WTURBULENCE.h
+  intern/tnt/jama_eig.h
+  intern/tnt/jama_lu.h
+  intern/tnt/tnt.h
+  intern/tnt/tnt_array1d.h
+  intern/tnt/tnt_array1d_utils.h
+  intern/tnt/tnt_array2d.h
+  intern/tnt/tnt_array2d_utils.h
+  intern/tnt/tnt_array3d.h
+  intern/tnt/tnt_array3d_utils.h
+  intern/tnt/tnt_cmat.h
+  intern/tnt/tnt_fortran_array1d.h
+  intern/tnt/tnt_fortran_array1d_utils.h
+  intern/tnt/tnt_fortran_array2d.h
+  intern/tnt/tnt_fortran_array2d_utils.h
+  intern/tnt/tnt_fortran_array3d.h
+  intern/tnt/tnt_fortran_array3d_utils.h
+  intern/tnt/tnt_i_refvec.h
+  intern/tnt/tnt_math_utils.h
+  intern/tnt/tnt_sparse_matrix_csr.h
+  intern/tnt/tnt_stopwatch.h
+  intern/tnt/tnt_subscript.h
+  intern/tnt/tnt_vec.h
+  intern/tnt/tnt_version.h
 )
 
 set(LIB
@@ -84,16 +84,16 @@ set(LIB
 add_definitions(-DDDF_DEBUG=0)
 
 if(WITH_OPENMP)
-	add_definitions(-DPARALLEL=1)
+  add_definitions(-DPARALLEL=1)
 else()
-	add_definitions(-DPARALLEL=0)
+  add_definitions(-DPARALLEL=0)
 endif()
 
 if(WITH_FFTW3)
-	add_definitions(-DWITH_FFTW3)
-	list(APPEND INC_SYS
-		${FFTW3_INCLUDE_DIRS}
-	)
+  add_definitions(-DWITH_FFTW3)
+  list(APPEND INC_SYS
+    ${FFTW3_INCLUDE_DIRS}
+  )
 endif()
 
 blender_add_lib(bf_intern_smoke "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")