Restructure Imath include for alembic.

wabiverse · Oct 20, 2023 · 7554811 · 7554811
1 parent ce5c7c8
commit 7554811
Show file tree

Hide file tree

Showing 90 changed files with 4 additions and 5 deletions.
diff --git a/Package.swift b/Package.swift
@@ -219,13 +219,12 @@ let package = Package(
         .target(name: "Boost"),
       ],
       exclude: [
-        "include/python/PyImathNumpy"
+        "include/Imath/python/PyImathNumpy"
       ],
-      publicHeadersPath: "include",
+      publicHeadersPath: "include/Imath",
       cxxSettings: [
-        .headerSearchPath("include/Imath"),
-        .headerSearchPath("include/python"),
-        .headerSearchPath("include/python/PyImath"),
+        .headerSearchPath("include/Imath/python"),
+        .headerSearchPath("include/Imath/python/PyImath"),
       ],
       swiftSettings: [
         .interoperabilityMode(.Cxx),

diff --git a/Sources/IMath/include/python/CMakeLists.txt → ...IMath/include/Imath/python/CMakeLists.txt b/Sources/IMath/include/python/CMakeLists.txt → ...IMath/include/Imath/python/CMakeLists.txt
diff --git a/Sources/IMath/include/python/PyImath.pc.in → .../IMath/include/Imath/python/PyImath.pc.in b/Sources/IMath/include/python/PyImath.pc.in → .../IMath/include/Imath/python/PyImath.pc.in
diff --git a/...ath/include/python/PyImath/CMakeLists.txt → ...clude/Imath/python/PyImath/CMakeLists.txt b/...ath/include/python/PyImath/CMakeLists.txt → ...clude/Imath/python/PyImath/CMakeLists.txt
diff --git a/.../IMath/include/python/PyImath/PyImath.cpp → .../include/Imath/python/PyImath/PyImath.cpp b/.../IMath/include/python/PyImath/PyImath.cpp → .../include/Imath/python/PyImath/PyImath.cpp
diff --git a/...es/IMath/include/python/PyImath/PyImath.h → ...th/include/Imath/python/PyImath/PyImath.h b/...es/IMath/include/python/PyImath/PyImath.h → ...th/include/Imath/python/PyImath/PyImath.h
diff --git a/...IMath/include/python/PyImath/PyImathAPI.h → ...include/Imath/python/PyImath/PyImathAPI.h b/...IMath/include/python/PyImath/PyImathAPI.h → ...include/Imath/python/PyImath/PyImathAPI.h
diff --git a/...e/python/PyImath/PyImathAutovectorize.cpp → ...h/python/PyImath/PyImathAutovectorize.cpp b/...e/python/PyImath/PyImathAutovectorize.cpp → ...h/python/PyImath/PyImathAutovectorize.cpp
diff --git a/...ude/python/PyImath/PyImathAutovectorize.h → ...ath/python/PyImath/PyImathAutovectorize.h b/...ude/python/PyImath/PyImathAutovectorize.h → ...ath/python/PyImath/PyImathAutovectorize.h
diff --git a/...lude/python/PyImath/PyImathBasicTypes.cpp → ...math/python/PyImath/PyImathBasicTypes.cpp b/...lude/python/PyImath/PyImathBasicTypes.cpp → ...math/python/PyImath/PyImathBasicTypes.cpp
diff --git a/...nclude/python/PyImath/PyImathBasicTypes.h → .../Imath/python/PyImath/PyImathBasicTypes.h b/...nclude/python/PyImath/PyImathBasicTypes.h → .../Imath/python/PyImath/PyImathBasicTypes.h
diff --git a/...ath/include/python/PyImath/PyImathBox.cpp → ...clude/Imath/python/PyImath/PyImathBox.cpp b/...ath/include/python/PyImath/PyImathBox.cpp → ...clude/Imath/python/PyImath/PyImathBox.cpp
diff --git a/...IMath/include/python/PyImath/PyImathBox.h → ...include/Imath/python/PyImath/PyImathBox.h b/...IMath/include/python/PyImath/PyImathBox.h → ...include/Imath/python/PyImath/PyImathBox.h
diff --git a/...clude/python/PyImath/PyImathBox2Array.cpp → ...Imath/python/PyImath/PyImathBox2Array.cpp b/...clude/python/PyImath/PyImathBox2Array.cpp → ...Imath/python/PyImath/PyImathBox2Array.cpp
diff --git a/...clude/python/PyImath/PyImathBox3Array.cpp → ...Imath/python/PyImath/PyImathBox3Array.cpp b/...clude/python/PyImath/PyImathBox3Array.cpp → ...Imath/python/PyImath/PyImathBox3Array.cpp
diff --git a/...lude/python/PyImath/PyImathBoxArrayImpl.h → ...math/python/PyImath/PyImathBoxArrayImpl.h b/...lude/python/PyImath/PyImathBoxArrayImpl.h → ...math/python/PyImath/PyImathBoxArrayImpl.h
diff --git a/.../python/PyImath/PyImathBufferProtocol.cpp → .../python/PyImath/PyImathBufferProtocol.cpp b/.../python/PyImath/PyImathBufferProtocol.cpp → .../python/PyImath/PyImathBufferProtocol.cpp
diff --git a/...de/python/PyImath/PyImathBufferProtocol.h → ...th/python/PyImath/PyImathBufferProtocol.h b/...de/python/PyImath/PyImathBufferProtocol.h → ...th/python/PyImath/PyImathBufferProtocol.h
diff --git a/...ath/include/python/PyImath/PyImathColor.h → ...clude/Imath/python/PyImath/PyImathColor.h b/...ath/include/python/PyImath/PyImathColor.h → ...clude/Imath/python/PyImath/PyImathColor.h
diff --git a/.../include/python/PyImath/PyImathColor3.cpp → ...de/Imath/python/PyImath/PyImathColor3.cpp b/.../include/python/PyImath/PyImathColor3.cpp → ...de/Imath/python/PyImath/PyImathColor3.cpp
diff --git a/...e/python/PyImath/PyImathColor3ArrayImpl.h → ...h/python/PyImath/PyImathColor3ArrayImpl.h b/...e/python/PyImath/PyImathColor3ArrayImpl.h → ...h/python/PyImath/PyImathColor3ArrayImpl.h
diff --git a/.../include/python/PyImath/PyImathColor4.cpp → ...de/Imath/python/PyImath/PyImathColor4.cpp b/.../include/python/PyImath/PyImathColor4.cpp → ...de/Imath/python/PyImath/PyImathColor4.cpp
diff --git a/...python/PyImath/PyImathColor4Array2DImpl.h → ...python/PyImath/PyImathColor4Array2DImpl.h b/...python/PyImath/PyImathColor4Array2DImpl.h → ...python/PyImath/PyImathColor4Array2DImpl.h
diff --git a/...e/python/PyImath/PyImathColor4ArrayImpl.h → ...h/python/PyImath/PyImathColor4ArrayImpl.h b/...e/python/PyImath/PyImathColor4ArrayImpl.h → ...h/python/PyImath/PyImathColor4ArrayImpl.h
diff --git a/...nclude/python/PyImath/PyImathDecorators.h → .../Imath/python/PyImath/PyImathDecorators.h b/...nclude/python/PyImath/PyImathDecorators.h → .../Imath/python/PyImath/PyImathDecorators.h
diff --git a/...h/include/python/PyImath/PyImathEuler.cpp → ...ude/Imath/python/PyImath/PyImathEuler.cpp b/...h/include/python/PyImath/PyImathEuler.cpp → ...ude/Imath/python/PyImath/PyImathEuler.cpp
diff --git a/...ath/include/python/PyImath/PyImathEuler.h → ...clude/Imath/python/PyImath/PyImathEuler.h b/...ath/include/python/PyImath/PyImathEuler.h → ...clude/Imath/python/PyImath/PyImathEuler.h
diff --git a/...th/include/python/PyImath/PyImathExport.h → ...lude/Imath/python/PyImath/PyImathExport.h b/...th/include/python/PyImath/PyImathExport.h → ...lude/Imath/python/PyImath/PyImathExport.h
diff --git a/...lude/python/PyImath/PyImathFixedArray.cpp → ...math/python/PyImath/PyImathFixedArray.cpp b/...lude/python/PyImath/PyImathFixedArray.cpp → ...math/python/PyImath/PyImathFixedArray.cpp
diff --git a/...nclude/python/PyImath/PyImathFixedArray.h → .../Imath/python/PyImath/PyImathFixedArray.h b/...nclude/python/PyImath/PyImathFixedArray.h → .../Imath/python/PyImath/PyImathFixedArray.h
diff --git a/...lude/python/PyImath/PyImathFixedArray2D.h → ...math/python/PyImath/PyImathFixedArray2D.h b/...lude/python/PyImath/PyImathFixedArray2D.h → ...math/python/PyImath/PyImathFixedArray2D.h
diff --git a/.../python/PyImath/PyImathFixedArrayTraits.h → .../python/PyImath/PyImathFixedArrayTraits.h b/.../python/PyImath/PyImathFixedArrayTraits.h → .../python/PyImath/PyImathFixedArrayTraits.h
diff --git a/...clude/python/PyImath/PyImathFixedMatrix.h → ...Imath/python/PyImath/PyImathFixedMatrix.h b/...clude/python/PyImath/PyImathFixedMatrix.h → ...Imath/python/PyImath/PyImathFixedMatrix.h
diff --git a/...ude/python/PyImath/PyImathFixedVArray.cpp → ...ath/python/PyImath/PyImathFixedVArray.cpp b/...ude/python/PyImath/PyImathFixedVArray.cpp → ...ath/python/PyImath/PyImathFixedVArray.cpp
diff --git a/...clude/python/PyImath/PyImathFixedVArray.h → ...Imath/python/PyImath/PyImathFixedVArray.h b/...clude/python/PyImath/PyImathFixedVArray.h → ...Imath/python/PyImath/PyImathFixedVArray.h
diff --git a/...include/python/PyImath/PyImathFrustum.cpp → ...e/Imath/python/PyImath/PyImathFrustum.cpp b/...include/python/PyImath/PyImathFrustum.cpp → ...e/Imath/python/PyImath/PyImathFrustum.cpp
diff --git a/...h/include/python/PyImath/PyImathFrustum.h → ...ude/Imath/python/PyImath/PyImathFrustum.h b/...h/include/python/PyImath/PyImathFrustum.h → ...ude/Imath/python/PyImath/PyImathFrustum.h
diff --git a/...ath/include/python/PyImath/PyImathFun.cpp → ...clude/Imath/python/PyImath/PyImathFun.cpp b/...ath/include/python/PyImath/PyImathFun.cpp → ...clude/Imath/python/PyImath/PyImathFun.cpp
diff --git a/...IMath/include/python/PyImath/PyImathFun.h → ...include/Imath/python/PyImath/PyImathFun.h b/...IMath/include/python/PyImath/PyImathFun.h → ...include/Imath/python/PyImath/PyImathFun.h
diff --git a/...lude/python/PyImath/PyImathFunOperators.h → ...math/python/PyImath/PyImathFunOperators.h b/...lude/python/PyImath/PyImathFunOperators.h → ...math/python/PyImath/PyImathFunOperators.h
diff --git a/...th/include/python/PyImath/PyImathLine.cpp → ...lude/Imath/python/PyImath/PyImathLine.cpp b/...th/include/python/PyImath/PyImathLine.cpp → ...lude/Imath/python/PyImath/PyImathLine.cpp
diff --git a/...Math/include/python/PyImath/PyImathLine.h → ...nclude/Imath/python/PyImath/PyImathLine.h b/...Math/include/python/PyImath/PyImathLine.h → ...nclude/Imath/python/PyImath/PyImathLine.h
diff --git a/...h/include/python/PyImath/PyImathMathExc.h → ...ude/Imath/python/PyImath/PyImathMathExc.h b/...h/include/python/PyImath/PyImathMathExc.h → ...ude/Imath/python/PyImath/PyImathMathExc.h
diff --git a/...th/include/python/PyImath/PyImathMatrix.h → ...lude/Imath/python/PyImath/PyImathMatrix.h b/...th/include/python/PyImath/PyImathMatrix.h → ...lude/Imath/python/PyImath/PyImathMatrix.h
diff --git a/...nclude/python/PyImath/PyImathMatrix22.cpp → .../Imath/python/PyImath/PyImathMatrix22.cpp b/...nclude/python/PyImath/PyImathMatrix22.cpp → .../Imath/python/PyImath/PyImathMatrix22.cpp
diff --git a/...nclude/python/PyImath/PyImathMatrix33.cpp → .../Imath/python/PyImath/PyImathMatrix33.cpp b/...nclude/python/PyImath/PyImathMatrix33.cpp → .../Imath/python/PyImath/PyImathMatrix33.cpp
diff --git a/...nclude/python/PyImath/PyImathMatrix44.cpp → .../Imath/python/PyImath/PyImathMatrix44.cpp b/...nclude/python/PyImath/PyImathMatrix44.cpp → .../Imath/python/PyImath/PyImathMatrix44.cpp
diff --git a/...include/python/PyImath/PyImathOperators.h → ...e/Imath/python/PyImath/PyImathOperators.h b/...include/python/PyImath/PyImathOperators.h → ...e/Imath/python/PyImath/PyImathOperators.h
diff --git a/...h/include/python/PyImath/PyImathPlane.cpp → ...ude/Imath/python/PyImath/PyImathPlane.cpp b/...h/include/python/PyImath/PyImathPlane.cpp → ...ude/Imath/python/PyImath/PyImathPlane.cpp
diff --git a/...ath/include/python/PyImath/PyImathPlane.h → ...clude/Imath/python/PyImath/PyImathPlane.h b/...ath/include/python/PyImath/PyImathPlane.h → ...clude/Imath/python/PyImath/PyImathPlane.h
diff --git a/...th/include/python/PyImath/PyImathQuat.cpp → ...lude/Imath/python/PyImath/PyImathQuat.cpp b/...th/include/python/PyImath/PyImathQuat.cpp → ...lude/Imath/python/PyImath/PyImathQuat.cpp
diff --git a/...Math/include/python/PyImath/PyImathQuat.h → ...nclude/Imath/python/PyImath/PyImathQuat.h b/...Math/include/python/PyImath/PyImathQuat.h → ...nclude/Imath/python/PyImath/PyImathQuat.h
diff --git a/...ude/python/PyImath/PyImathQuatOperators.h → ...ath/python/PyImath/PyImathQuatOperators.h b/...ude/python/PyImath/PyImathQuatOperators.h → ...ath/python/PyImath/PyImathQuatOperators.h
diff --git a/.../include/python/PyImath/PyImathRandom.cpp → ...de/Imath/python/PyImath/PyImathRandom.cpp b/.../include/python/PyImath/PyImathRandom.cpp → ...de/Imath/python/PyImath/PyImathRandom.cpp
diff --git a/...th/include/python/PyImath/PyImathRandom.h → ...lude/Imath/python/PyImath/PyImathRandom.h b/...th/include/python/PyImath/PyImathRandom.h → ...lude/Imath/python/PyImath/PyImathRandom.h
diff --git a/...h/include/python/PyImath/PyImathShear.cpp → ...ude/Imath/python/PyImath/PyImathShear.cpp b/...h/include/python/PyImath/PyImathShear.cpp → ...ude/Imath/python/PyImath/PyImathShear.cpp
diff --git a/...ath/include/python/PyImath/PyImathShear.h → ...clude/Imath/python/PyImath/PyImathShear.h b/...ath/include/python/PyImath/PyImathShear.h → ...clude/Imath/python/PyImath/PyImathShear.h
diff --git a/...ude/python/PyImath/PyImathStringArray.cpp → ...ath/python/PyImath/PyImathStringArray.cpp b/...ude/python/PyImath/PyImathStringArray.cpp → ...ath/python/PyImath/PyImathStringArray.cpp
diff --git a/...clude/python/PyImath/PyImathStringArray.h → ...Imath/python/PyImath/PyImathStringArray.h b/...clude/python/PyImath/PyImathStringArray.h → ...Imath/python/PyImath/PyImathStringArray.h
diff --git a/...thon/PyImath/PyImathStringArrayRegister.h → ...thon/PyImath/PyImathStringArrayRegister.h b/...thon/PyImath/PyImathStringArrayRegister.h → ...thon/PyImath/PyImathStringArrayRegister.h
diff --git a/...ude/python/PyImath/PyImathStringTable.cpp → ...ath/python/PyImath/PyImathStringTable.cpp b/...ude/python/PyImath/PyImathStringTable.cpp → ...ath/python/PyImath/PyImathStringTable.cpp
diff --git a/...clude/python/PyImath/PyImathStringTable.h → ...Imath/python/PyImath/PyImathStringTable.h b/...clude/python/PyImath/PyImathStringTable.h → ...Imath/python/PyImath/PyImathStringTable.h
diff --git a/...th/include/python/PyImath/PyImathTask.cpp → ...lude/Imath/python/PyImath/PyImathTask.cpp b/...th/include/python/PyImath/PyImathTask.cpp → ...lude/Imath/python/PyImath/PyImathTask.cpp
diff --git a/...Math/include/python/PyImath/PyImathTask.h → ...nclude/Imath/python/PyImath/PyImathTask.h b/...Math/include/python/PyImath/PyImathTask.h → ...nclude/Imath/python/PyImath/PyImathTask.h
diff --git a/...th/include/python/PyImath/PyImathUtil.cpp → ...lude/Imath/python/PyImath/PyImathUtil.cpp b/...th/include/python/PyImath/PyImathUtil.cpp → ...lude/Imath/python/PyImath/PyImathUtil.cpp
diff --git a/...Math/include/python/PyImath/PyImathUtil.h → ...nclude/Imath/python/PyImath/PyImathUtil.h b/...Math/include/python/PyImath/PyImathUtil.h → ...nclude/Imath/python/PyImath/PyImathUtil.h
diff --git a/...IMath/include/python/PyImath/PyImathVec.h → ...include/Imath/python/PyImath/PyImathVec.h b/...IMath/include/python/PyImath/PyImathVec.h → ...include/Imath/python/PyImath/PyImathVec.h
diff --git a/.../include/python/PyImath/PyImathVec2Impl.h → ...de/Imath/python/PyImath/PyImathVec2Impl.h b/.../include/python/PyImath/PyImathVec2Impl.h → ...de/Imath/python/PyImath/PyImathVec2Impl.h
diff --git a/.../include/python/PyImath/PyImathVec2fd.cpp → ...de/Imath/python/PyImath/PyImathVec2fd.cpp b/.../include/python/PyImath/PyImathVec2fd.cpp → ...de/Imath/python/PyImath/PyImathVec2fd.cpp
diff --git a/.../include/python/PyImath/PyImathVec2si.cpp → ...de/Imath/python/PyImath/PyImathVec2si.cpp b/.../include/python/PyImath/PyImathVec2si.cpp → ...de/Imath/python/PyImath/PyImathVec2si.cpp
diff --git a/...ude/python/PyImath/PyImathVec3ArrayImpl.h → ...ath/python/PyImath/PyImathVec3ArrayImpl.h b/...ude/python/PyImath/PyImathVec3ArrayImpl.h → ...ath/python/PyImath/PyImathVec3ArrayImpl.h
diff --git a/.../include/python/PyImath/PyImathVec3Impl.h → ...de/Imath/python/PyImath/PyImathVec3Impl.h b/.../include/python/PyImath/PyImathVec3Impl.h → ...de/Imath/python/PyImath/PyImathVec3Impl.h
diff --git a/.../include/python/PyImath/PyImathVec3fd.cpp → ...de/Imath/python/PyImath/PyImathVec3fd.cpp b/.../include/python/PyImath/PyImathVec3fd.cpp → ...de/Imath/python/PyImath/PyImathVec3fd.cpp
diff --git a/.../include/python/PyImath/PyImathVec3si.cpp → ...de/Imath/python/PyImath/PyImathVec3si.cpp b/.../include/python/PyImath/PyImathVec3si.cpp → ...de/Imath/python/PyImath/PyImathVec3si.cpp
diff --git a/...ude/python/PyImath/PyImathVec3siArray.cpp → ...ath/python/PyImath/PyImathVec3siArray.cpp b/...ude/python/PyImath/PyImathVec3siArray.cpp → ...ath/python/PyImath/PyImathVec3siArray.cpp
diff --git a/...ude/python/PyImath/PyImathVec4ArrayImpl.h → ...ath/python/PyImath/PyImathVec4ArrayImpl.h b/...ude/python/PyImath/PyImathVec4ArrayImpl.h → ...ath/python/PyImath/PyImathVec4ArrayImpl.h
diff --git a/.../include/python/PyImath/PyImathVec4Impl.h → ...de/Imath/python/PyImath/PyImathVec4Impl.h b/.../include/python/PyImath/PyImathVec4Impl.h → ...de/Imath/python/PyImath/PyImathVec4Impl.h
diff --git a/.../include/python/PyImath/PyImathVec4fd.cpp → ...de/Imath/python/PyImath/PyImathVec4fd.cpp b/.../include/python/PyImath/PyImathVec4fd.cpp → ...de/Imath/python/PyImath/PyImathVec4fd.cpp
diff --git a/.../include/python/PyImath/PyImathVec4si.cpp → ...de/Imath/python/PyImath/PyImathVec4si.cpp b/.../include/python/PyImath/PyImathVec4si.cpp → ...de/Imath/python/PyImath/PyImathVec4si.cpp
diff --git a/...ude/python/PyImath/PyImathVec4siArray.cpp → ...ath/python/PyImath/PyImathVec4siArray.cpp b/...ude/python/PyImath/PyImathVec4siArray.cpp → ...ath/python/PyImath/PyImathVec4siArray.cpp
diff --git a/...lude/python/PyImath/PyImathVecOperators.h → ...math/python/PyImath/PyImathVecOperators.h b/...lude/python/PyImath/PyImathVecOperators.h → ...math/python/PyImath/PyImathVecOperators.h
diff --git a/...th/include/python/PyImath/imathmodule.cpp → ...lude/Imath/python/PyImath/imathmodule.cpp b/...th/include/python/PyImath/imathmodule.cpp → ...lude/Imath/python/PyImath/imathmodule.cpp
diff --git a/...nclude/python/PyImath/varraySemantics.txt → .../Imath/python/PyImath/varraySemantics.txt b/...nclude/python/PyImath/varraySemantics.txt → .../Imath/python/PyImath/varraySemantics.txt
diff --git a/...nclude/python/PyImathNumpy/CMakeLists.txt → .../Imath/python/PyImathNumpy/CMakeLists.txt b/...nclude/python/PyImathNumpy/CMakeLists.txt → .../Imath/python/PyImathNumpy/CMakeLists.txt
diff --git a/.../python/PyImathNumpy/imathnumpymodule.cpp → .../python/PyImathNumpy/imathnumpymodule.cpp b/.../python/PyImathNumpy/imathnumpymodule.cpp → .../python/PyImathNumpy/imathnumpymodule.cpp
diff --git a/...Math/include/python/config/CMakeLists.txt → ...nclude/Imath/python/config/CMakeLists.txt b/...Math/include/python/config/CMakeLists.txt → ...nclude/Imath/python/config/CMakeLists.txt
diff --git a/.../include/python/config/ModuleDefine.cmake → ...de/Imath/python/config/ModuleDefine.cmake b/.../include/python/config/ModuleDefine.cmake → ...de/Imath/python/config/ModuleDefine.cmake
diff --git a/...h/include/python/config/NumPyLocate.cmake → ...ude/Imath/python/config/NumPyLocate.cmake b/...h/include/python/config/NumPyLocate.cmake → ...ude/Imath/python/config/NumPyLocate.cmake
diff --git a/.../include/python/config/PyImathConfig.h.in → ...de/Imath/python/config/PyImathConfig.h.in b/.../include/python/config/PyImathConfig.h.in → ...de/Imath/python/config/PyImathConfig.h.in
diff --git a/.../include/python/config/PyImathSetup.cmake → ...de/Imath/python/config/PyImathSetup.cmake b/.../include/python/config/PyImathSetup.cmake → ...de/Imath/python/config/PyImathSetup.cmake