Skip to content

Commit 1985a11

Browse files
cary-ilmcary-ilm
authored
Reset default install folder for PyImath to include/Imath (AcademySoftwareFoundation#508)
The default inadvertently changed to include/PyImath in the v3.2 release. The significant change here to properly set the default for `PYIMATH_OUTPUT_SUBDIR` and use it in `src/python/PyImath/CMakeLists.txt`. The changes in the install manifests simply correct the mistaken install locations. Note that the 'custom namespace' job specifies a specific value of the subdir, to validate that the setting gets properly overridden. Signed-off-by: Cary Phillips <cary@ilm.com>
1 parent 8a14cf7 commit 1985a11

22 files changed

Lines changed: 544 additions & 542 deletions

‎.github/workflows/ci_steps.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,8 @@ jobs:
303303
cmake_args+=("-DIMATH_LIB_SUFFIX=${{ inputs.namespace }}")
304304
cmake_args+=("-DPYIMATH_LIB_SUFFIX=PY_${{ inputs.namespace }}")
305305
cmake_args+=("-DPYBINDIMATH_LIB_SUFFIX=PYBIND_${{ inputs.namespace }}")
306+
cmake_args+=("-DPYIMATH_OUTPUT_SUBDIR=PyImath")
307+
cmake_args+=("-DPYBINDIMATH_OUTPUT_SUBDIR=PyBindImath")
306308
fi
307309
if [ "${{ inputs.IMATH_BUILD_APPLE_FRAMEWORKS }}" == "ON" ]; then
308310
cmake_args+=("-DCMAKE_SYSTEM_NAME=iOS")

‎share/ci/install_manifest/install_manifest.linux.1.txt‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -36,50 +36,50 @@ include/Imath/ImathVecAlgo.h
3636
include/Imath/half.h
3737
include/Imath/halfFunction.h
3838
include/Imath/halfLimits.h
39-
include/PyBindImath/PyBindImath.h
40-
include/PyBindImath/PyBindImathExport.h
41-
include/PyImath/PyImath.h
42-
include/PyImath/PyImathAPI.h
43-
include/PyImath/PyImathAutovectorize.h
44-
include/PyImath/PyImathBasicTypes.h
45-
include/PyImath/PyImathBox.h
46-
include/PyImath/PyImathBoxArrayImpl.h
47-
include/PyImath/PyImathBufferProtocol.h
48-
include/PyImath/PyImathColor.h
49-
include/PyImath/PyImathColor3ArrayImpl.h
50-
include/PyImath/PyImathColor4Array2DImpl.h
51-
include/PyImath/PyImathColor4ArrayImpl.h
52-
include/PyImath/PyImathDecorators.h
53-
include/PyImath/PyImathEuler.h
54-
include/PyImath/PyImathExport.h
55-
include/PyImath/PyImathFixedArray.h
56-
include/PyImath/PyImathFixedArray2D.h
57-
include/PyImath/PyImathFixedArrayTraits.h
58-
include/PyImath/PyImathFixedMatrix.h
59-
include/PyImath/PyImathFixedVArray.h
60-
include/PyImath/PyImathFrustum.h
61-
include/PyImath/PyImathFun.h
62-
include/PyImath/PyImathLine.h
63-
include/PyImath/PyImathMathExc.h
64-
include/PyImath/PyImathMatrix.h
65-
include/PyImath/PyImathOperators.h
66-
include/PyImath/PyImathPlane.h
67-
include/PyImath/PyImathQuat.h
68-
include/PyImath/PyImathQuatOperators.h
69-
include/PyImath/PyImathRandom.h
70-
include/PyImath/PyImathShear.h
71-
include/PyImath/PyImathStringArray.h
72-
include/PyImath/PyImathStringArrayRegister.h
73-
include/PyImath/PyImathStringTable.h
74-
include/PyImath/PyImathTask.h
75-
include/PyImath/PyImathUtil.h
76-
include/PyImath/PyImathVec.h
77-
include/PyImath/PyImathVec2Impl.h
78-
include/PyImath/PyImathVec3ArrayImpl.h
79-
include/PyImath/PyImathVec3Impl.h
80-
include/PyImath/PyImathVec4ArrayImpl.h
81-
include/PyImath/PyImathVec4Impl.h
82-
include/PyImath/PyImathVecOperators.h
39+
include/Imath/PyBindImath.h
40+
include/Imath/PyBindImathExport.h
41+
include/Imath/PyImath.h
42+
include/Imath/PyImathAPI.h
43+
include/Imath/PyImathAutovectorize.h
44+
include/Imath/PyImathBasicTypes.h
45+
include/Imath/PyImathBox.h
46+
include/Imath/PyImathBoxArrayImpl.h
47+
include/Imath/PyImathBufferProtocol.h
48+
include/Imath/PyImathColor.h
49+
include/Imath/PyImathColor3ArrayImpl.h
50+
include/Imath/PyImathColor4Array2DImpl.h
51+
include/Imath/PyImathColor4ArrayImpl.h
52+
include/Imath/PyImathDecorators.h
53+
include/Imath/PyImathEuler.h
54+
include/Imath/PyImathExport.h
55+
include/Imath/PyImathFixedArray.h
56+
include/Imath/PyImathFixedArray2D.h
57+
include/Imath/PyImathFixedArrayTraits.h
58+
include/Imath/PyImathFixedMatrix.h
59+
include/Imath/PyImathFixedVArray.h
60+
include/Imath/PyImathFrustum.h
61+
include/Imath/PyImathFun.h
62+
include/Imath/PyImathLine.h
63+
include/Imath/PyImathMathExc.h
64+
include/Imath/PyImathMatrix.h
65+
include/Imath/PyImathOperators.h
66+
include/Imath/PyImathPlane.h
67+
include/Imath/PyImathQuat.h
68+
include/Imath/PyImathQuatOperators.h
69+
include/Imath/PyImathRandom.h
70+
include/Imath/PyImathShear.h
71+
include/Imath/PyImathStringArray.h
72+
include/Imath/PyImathStringArrayRegister.h
73+
include/Imath/PyImathStringTable.h
74+
include/Imath/PyImathTask.h
75+
include/Imath/PyImathUtil.h
76+
include/Imath/PyImathVec.h
77+
include/Imath/PyImathVec2Impl.h
78+
include/Imath/PyImathVec3ArrayImpl.h
79+
include/Imath/PyImathVec3Impl.h
80+
include/Imath/PyImathVec4ArrayImpl.h
81+
include/Imath/PyImathVec4Impl.h
82+
include/Imath/PyImathVecOperators.h
8383
lib/cmake/Imath/ImathConfig.cmake
8484
lib/cmake/Imath/ImathConfigVersion.cmake
8585
lib/cmake/Imath/ImathTargets-release.cmake

‎share/ci/install_manifest/install_manifest.linux.2.txt‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -37,50 +37,50 @@ include/Imath/ImathVecAlgo.h
3737
include/Imath/half.h
3838
include/Imath/halfFunction.h
3939
include/Imath/halfLimits.h
40-
include/PyBindImath/PyBindImath.h
41-
include/PyBindImath/PyBindImathExport.h
42-
include/PyImath/PyImath.h
43-
include/PyImath/PyImathAPI.h
44-
include/PyImath/PyImathAutovectorize.h
45-
include/PyImath/PyImathBasicTypes.h
46-
include/PyImath/PyImathBox.h
47-
include/PyImath/PyImathBoxArrayImpl.h
48-
include/PyImath/PyImathBufferProtocol.h
49-
include/PyImath/PyImathColor.h
50-
include/PyImath/PyImathColor3ArrayImpl.h
51-
include/PyImath/PyImathColor4Array2DImpl.h
52-
include/PyImath/PyImathColor4ArrayImpl.h
53-
include/PyImath/PyImathDecorators.h
54-
include/PyImath/PyImathEuler.h
55-
include/PyImath/PyImathExport.h
56-
include/PyImath/PyImathFixedArray.h
57-
include/PyImath/PyImathFixedArray2D.h
58-
include/PyImath/PyImathFixedArrayTraits.h
59-
include/PyImath/PyImathFixedMatrix.h
60-
include/PyImath/PyImathFixedVArray.h
61-
include/PyImath/PyImathFrustum.h
62-
include/PyImath/PyImathFun.h
63-
include/PyImath/PyImathLine.h
64-
include/PyImath/PyImathMathExc.h
65-
include/PyImath/PyImathMatrix.h
66-
include/PyImath/PyImathOperators.h
67-
include/PyImath/PyImathPlane.h
68-
include/PyImath/PyImathQuat.h
69-
include/PyImath/PyImathQuatOperators.h
70-
include/PyImath/PyImathRandom.h
71-
include/PyImath/PyImathShear.h
72-
include/PyImath/PyImathStringArray.h
73-
include/PyImath/PyImathStringArrayRegister.h
74-
include/PyImath/PyImathStringTable.h
75-
include/PyImath/PyImathTask.h
76-
include/PyImath/PyImathUtil.h
77-
include/PyImath/PyImathVec.h
78-
include/PyImath/PyImathVec2Impl.h
79-
include/PyImath/PyImathVec3ArrayImpl.h
80-
include/PyImath/PyImathVec3Impl.h
81-
include/PyImath/PyImathVec4ArrayImpl.h
82-
include/PyImath/PyImathVec4Impl.h
83-
include/PyImath/PyImathVecOperators.h
40+
include/Imath/PyBindImath.h
41+
include/Imath/PyBindImathExport.h
42+
include/Imath/PyImath.h
43+
include/Imath/PyImathAPI.h
44+
include/Imath/PyImathAutovectorize.h
45+
include/Imath/PyImathBasicTypes.h
46+
include/Imath/PyImathBox.h
47+
include/Imath/PyImathBoxArrayImpl.h
48+
include/Imath/PyImathBufferProtocol.h
49+
include/Imath/PyImathColor.h
50+
include/Imath/PyImathColor3ArrayImpl.h
51+
include/Imath/PyImathColor4Array2DImpl.h
52+
include/Imath/PyImathColor4ArrayImpl.h
53+
include/Imath/PyImathDecorators.h
54+
include/Imath/PyImathEuler.h
55+
include/Imath/PyImathExport.h
56+
include/Imath/PyImathFixedArray.h
57+
include/Imath/PyImathFixedArray2D.h
58+
include/Imath/PyImathFixedArrayTraits.h
59+
include/Imath/PyImathFixedMatrix.h
60+
include/Imath/PyImathFixedVArray.h
61+
include/Imath/PyImathFrustum.h
62+
include/Imath/PyImathFun.h
63+
include/Imath/PyImathLine.h
64+
include/Imath/PyImathMathExc.h
65+
include/Imath/PyImathMatrix.h
66+
include/Imath/PyImathOperators.h
67+
include/Imath/PyImathPlane.h
68+
include/Imath/PyImathQuat.h
69+
include/Imath/PyImathQuatOperators.h
70+
include/Imath/PyImathRandom.h
71+
include/Imath/PyImathShear.h
72+
include/Imath/PyImathStringArray.h
73+
include/Imath/PyImathStringArrayRegister.h
74+
include/Imath/PyImathStringTable.h
75+
include/Imath/PyImathTask.h
76+
include/Imath/PyImathUtil.h
77+
include/Imath/PyImathVec.h
78+
include/Imath/PyImathVec2Impl.h
79+
include/Imath/PyImathVec3ArrayImpl.h
80+
include/Imath/PyImathVec3Impl.h
81+
include/Imath/PyImathVec4ArrayImpl.h
82+
include/Imath/PyImathVec4Impl.h
83+
include/Imath/PyImathVecOperators.h
8484
lib/cmake/Imath/ImathConfig.cmake
8585
lib/cmake/Imath/ImathConfigVersion.cmake
8686
lib/cmake/Imath/ImathTargets-debug.cmake

‎share/ci/install_manifest/install_manifest.linux.3.txt‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -36,50 +36,50 @@ include/Imath/ImathVecAlgo.h
3636
include/Imath/half.h
3737
include/Imath/halfFunction.h
3838
include/Imath/halfLimits.h
39-
include/PyBindImath/PyBindImath.h
40-
include/PyBindImath/PyBindImathExport.h
41-
include/PyImath/PyImath.h
42-
include/PyImath/PyImathAPI.h
43-
include/PyImath/PyImathAutovectorize.h
44-
include/PyImath/PyImathBasicTypes.h
45-
include/PyImath/PyImathBox.h
46-
include/PyImath/PyImathBoxArrayImpl.h
47-
include/PyImath/PyImathBufferProtocol.h
48-
include/PyImath/PyImathColor.h
49-
include/PyImath/PyImathColor3ArrayImpl.h
50-
include/PyImath/PyImathColor4Array2DImpl.h
51-
include/PyImath/PyImathColor4ArrayImpl.h
52-
include/PyImath/PyImathDecorators.h
53-
include/PyImath/PyImathEuler.h
54-
include/PyImath/PyImathExport.h
55-
include/PyImath/PyImathFixedArray.h
56-
include/PyImath/PyImathFixedArray2D.h
57-
include/PyImath/PyImathFixedArrayTraits.h
58-
include/PyImath/PyImathFixedMatrix.h
59-
include/PyImath/PyImathFixedVArray.h
60-
include/PyImath/PyImathFrustum.h
61-
include/PyImath/PyImathFun.h
62-
include/PyImath/PyImathLine.h
63-
include/PyImath/PyImathMathExc.h
64-
include/PyImath/PyImathMatrix.h
65-
include/PyImath/PyImathOperators.h
66-
include/PyImath/PyImathPlane.h
67-
include/PyImath/PyImathQuat.h
68-
include/PyImath/PyImathQuatOperators.h
69-
include/PyImath/PyImathRandom.h
70-
include/PyImath/PyImathShear.h
71-
include/PyImath/PyImathStringArray.h
72-
include/PyImath/PyImathStringArrayRegister.h
73-
include/PyImath/PyImathStringTable.h
74-
include/PyImath/PyImathTask.h
75-
include/PyImath/PyImathUtil.h
76-
include/PyImath/PyImathVec.h
77-
include/PyImath/PyImathVec2Impl.h
78-
include/PyImath/PyImathVec3ArrayImpl.h
79-
include/PyImath/PyImathVec3Impl.h
80-
include/PyImath/PyImathVec4ArrayImpl.h
81-
include/PyImath/PyImathVec4Impl.h
82-
include/PyImath/PyImathVecOperators.h
39+
include/Imath/PyBindImath.h
40+
include/Imath/PyBindImathExport.h
41+
include/Imath/PyImath.h
42+
include/Imath/PyImathAPI.h
43+
include/Imath/PyImathAutovectorize.h
44+
include/Imath/PyImathBasicTypes.h
45+
include/Imath/PyImathBox.h
46+
include/Imath/PyImathBoxArrayImpl.h
47+
include/Imath/PyImathBufferProtocol.h
48+
include/Imath/PyImathColor.h
49+
include/Imath/PyImathColor3ArrayImpl.h
50+
include/Imath/PyImathColor4Array2DImpl.h
51+
include/Imath/PyImathColor4ArrayImpl.h
52+
include/Imath/PyImathDecorators.h
53+
include/Imath/PyImathEuler.h
54+
include/Imath/PyImathExport.h
55+
include/Imath/PyImathFixedArray.h
56+
include/Imath/PyImathFixedArray2D.h
57+
include/Imath/PyImathFixedArrayTraits.h
58+
include/Imath/PyImathFixedMatrix.h
59+
include/Imath/PyImathFixedVArray.h
60+
include/Imath/PyImathFrustum.h
61+
include/Imath/PyImathFun.h
62+
include/Imath/PyImathLine.h
63+
include/Imath/PyImathMathExc.h
64+
include/Imath/PyImathMatrix.h
65+
include/Imath/PyImathOperators.h
66+
include/Imath/PyImathPlane.h
67+
include/Imath/PyImathQuat.h
68+
include/Imath/PyImathQuatOperators.h
69+
include/Imath/PyImathRandom.h
70+
include/Imath/PyImathShear.h
71+
include/Imath/PyImathStringArray.h
72+
include/Imath/PyImathStringArrayRegister.h
73+
include/Imath/PyImathStringTable.h
74+
include/Imath/PyImathTask.h
75+
include/Imath/PyImathUtil.h
76+
include/Imath/PyImathVec.h
77+
include/Imath/PyImathVec2Impl.h
78+
include/Imath/PyImathVec3ArrayImpl.h
79+
include/Imath/PyImathVec3Impl.h
80+
include/Imath/PyImathVec4ArrayImpl.h
81+
include/Imath/PyImathVec4Impl.h
82+
include/Imath/PyImathVecOperators.h
8383
lib/cmake/Imath/ImathConfig.cmake
8484
lib/cmake/Imath/ImathConfigVersion.cmake
8585
lib/cmake/Imath/ImathTargets-release.cmake

‎share/ci/install_manifest/install_manifest.linux.6.txt‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -36,50 +36,50 @@ include/Imath/ImathVecAlgo.h
3636
include/Imath/half.h
3737
include/Imath/halfFunction.h
3838
include/Imath/halfLimits.h
39-
include/PyBindImath/PyBindImath.h
40-
include/PyBindImath/PyBindImathExport.h
41-
include/PyImath/PyImath.h
42-
include/PyImath/PyImathAPI.h
43-
include/PyImath/PyImathAutovectorize.h
44-
include/PyImath/PyImathBasicTypes.h
45-
include/PyImath/PyImathBox.h
46-
include/PyImath/PyImathBoxArrayImpl.h
47-
include/PyImath/PyImathBufferProtocol.h
48-
include/PyImath/PyImathColor.h
49-
include/PyImath/PyImathColor3ArrayImpl.h
50-
include/PyImath/PyImathColor4Array2DImpl.h
51-
include/PyImath/PyImathColor4ArrayImpl.h
52-
include/PyImath/PyImathDecorators.h
53-
include/PyImath/PyImathEuler.h
54-
include/PyImath/PyImathExport.h
55-
include/PyImath/PyImathFixedArray.h
56-
include/PyImath/PyImathFixedArray2D.h
57-
include/PyImath/PyImathFixedArrayTraits.h
58-
include/PyImath/PyImathFixedMatrix.h
59-
include/PyImath/PyImathFixedVArray.h
60-
include/PyImath/PyImathFrustum.h
61-
include/PyImath/PyImathFun.h
62-
include/PyImath/PyImathLine.h
63-
include/PyImath/PyImathMathExc.h
64-
include/PyImath/PyImathMatrix.h
65-
include/PyImath/PyImathOperators.h
66-
include/PyImath/PyImathPlane.h
67-
include/PyImath/PyImathQuat.h
68-
include/PyImath/PyImathQuatOperators.h
69-
include/PyImath/PyImathRandom.h
70-
include/PyImath/PyImathShear.h
71-
include/PyImath/PyImathStringArray.h
72-
include/PyImath/PyImathStringArrayRegister.h
73-
include/PyImath/PyImathStringTable.h
74-
include/PyImath/PyImathTask.h
75-
include/PyImath/PyImathUtil.h
76-
include/PyImath/PyImathVec.h
77-
include/PyImath/PyImathVec2Impl.h
78-
include/PyImath/PyImathVec3ArrayImpl.h
79-
include/PyImath/PyImathVec3Impl.h
80-
include/PyImath/PyImathVec4ArrayImpl.h
81-
include/PyImath/PyImathVec4Impl.h
82-
include/PyImath/PyImathVecOperators.h
39+
include/Imath/PyBindImath.h
40+
include/Imath/PyBindImathExport.h
41+
include/Imath/PyImath.h
42+
include/Imath/PyImathAPI.h
43+
include/Imath/PyImathAutovectorize.h
44+
include/Imath/PyImathBasicTypes.h
45+
include/Imath/PyImathBox.h
46+
include/Imath/PyImathBoxArrayImpl.h
47+
include/Imath/PyImathBufferProtocol.h
48+
include/Imath/PyImathColor.h
49+
include/Imath/PyImathColor3ArrayImpl.h
50+
include/Imath/PyImathColor4Array2DImpl.h
51+
include/Imath/PyImathColor4ArrayImpl.h
52+
include/Imath/PyImathDecorators.h
53+
include/Imath/PyImathEuler.h
54+
include/Imath/PyImathExport.h
55+
include/Imath/PyImathFixedArray.h
56+
include/Imath/PyImathFixedArray2D.h
57+
include/Imath/PyImathFixedArrayTraits.h
58+
include/Imath/PyImathFixedMatrix.h
59+
include/Imath/PyImathFixedVArray.h
60+
include/Imath/PyImathFrustum.h
61+
include/Imath/PyImathFun.h
62+
include/Imath/PyImathLine.h
63+
include/Imath/PyImathMathExc.h
64+
include/Imath/PyImathMatrix.h
65+
include/Imath/PyImathOperators.h
66+
include/Imath/PyImathPlane.h
67+
include/Imath/PyImathQuat.h
68+
include/Imath/PyImathQuatOperators.h
69+
include/Imath/PyImathRandom.h
70+
include/Imath/PyImathShear.h
71+
include/Imath/PyImathStringArray.h
72+
include/Imath/PyImathStringArrayRegister.h
73+
include/Imath/PyImathStringTable.h
74+
include/Imath/PyImathTask.h
75+
include/Imath/PyImathUtil.h
76+
include/Imath/PyImathVec.h
77+
include/Imath/PyImathVec2Impl.h
78+
include/Imath/PyImathVec3ArrayImpl.h
79+
include/Imath/PyImathVec3Impl.h
80+
include/Imath/PyImathVec4ArrayImpl.h
81+
include/Imath/PyImathVec4Impl.h
82+
include/Imath/PyImathVecOperators.h
8383
lib/cmake/Imath/ImathConfig.cmake
8484
lib/cmake/Imath/ImathConfigVersion.cmake
8585
lib/cmake/Imath/ImathTargets-release.cmake

0 commit comments

Comments
 (0)