[gentoo-commits] repo/gentoo:master commit in: dev-libs/imath/, dev-libs/imath/files/
commit: c42151df299e6767ecc40bc47d59d415f1c9e47b
Author: Bernd Waibel posteo net>
AuthorDate: Mon Nov 14 16:55:15 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Wed Nov 23 17:55:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c42151df
dev-libs/imath: drop 3.1.4-r3, 3.1.4-r4
Signed-off-by: Bernd Waibel posteo.net>
Signed-off-by: Joonas Niilola gentoo.org>
dev-libs/imath/Manifest| 1 -
...alf.h-include-intrinsics-for-f16c-capable.patch | 26
dev-libs/imath/imath-3.1.4-r3.ebuild | 72 -
dev-libs/imath/imath-3.1.4-r4.ebuild | 74 --
4 files changed, 173 deletions(-)
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index 304e397347ea..6c4f76aba7b1 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,3 +1,2 @@
-DIST imath-3.1.4.tar.gz 572214 BLAKE2B
6d67f542256e44f9ba6f30ae7d22a37dbf3cd1e49992fb8b0e2264d51d47e9c2297940b3a484e1f59bd8b251e8ef42d81ae88282d0769c111b3cd84cd0a9354e
SHA512
f9f7d8ec333e6383191543ee927dc40e870a6330225b01070bb93ad3d149c5e31bd5989d4dc52f3321490c1c5a7cab55582c6e42e34ab4ca5723170e7578e286
DIST imath-3.1.5.tar.gz 570875 BLAKE2B
f78c8278a3ecb40afaa291b74c50c2ce01a5cba594e690041a57cfd3a65f9fe0842a41d600906ed864df239c2753488dedca53bdfa65a90c13513111a8068ca4
SHA512
8344e42c75d8e4bb21facb837535f0c9e4a9489d9edebcc25d5d3c6063535f2bf54e4517d8fca3fedada248457aa07c9bd77d6e843a9d115278fc154de2cdc9d
DIST imath-3.1.6.tar.gz 573255 BLAKE2B
c4d5a785a2aed9c5b9b1441ab016a5cf47abeb1d44c0625f0654e8c4d1e47dd62c61f83fd7b160beae8aaf5db9350d2a3bc43754e795fe75b10c4836a1b8
SHA512
c099a291ed7fd7702a7609575f2f3d2ed7f95256c23c2180e2ef1f76ceb07734365f57da5244b1d6cec81ca9859864eb4c9236df02a64aa783af6639a3b59acd
diff --git
a/dev-libs/imath/files/imath-3.1.4-half.h-include-intrinsics-for-f16c-capable.patch
b/dev-libs/imath/files/imath-3.1.4-half.h-include-intrinsics-for-f16c-capable.patch
deleted file mode 100644
index 5211bd450e38..
---
a/dev-libs/imath/files/imath-3.1.4-half.h-include-intrinsics-for-f16c-capable.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 41e7d468246440f30bc75e7a6a316a9a07e77b23 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel
-Date: Sun, 6 Mar 2022 10:07:09 +0100
-Subject: [PATCH] half.h: include intrinsics for f16c capable x86 targets
-
-Reported-by: bzoloid
-Suggested-by: bzoloid
-
-Bug: https://bugs.gentoo.org/834628
-Bug: https://github.com/AcademySoftwareFoundation/Imath/issues/239
-
-Signed-off-by: Bernd Waibel
a/src/Imath/half.h
-+++ b/src/Imath/half.h
-@@ -181,6 +181,8 @@
- #include
- #elif defined(__x86_64__)
- #include
-+#elif defined(__F16C__)
-+# include
- #endif
-
- #include
---
-2.35.1
-
diff --git a/dev-libs/imath/imath-3.1.4-r3.ebuild
b/dev-libs/imath/imath-3.1.4-r3.ebuild
deleted file mode 100644
index 32a4e1bd3c33..
--- a/dev-libs/imath/imath-3.1.4-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake python-single-r1
-
-MY_PN="${PN^}"
-
-DESCRIPTION="Imath basic math package"
-HOMEPAGE="https://imath.readthedocs.io;
-SRC_URI="https://github.com/AcademySoftwareFoundation/${MY_PN}/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
-# re-keywording needed for (according to ilmbase keywords): ~x64-macos
~x86-solaris
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
~amd64-linux ~x86-linux"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="BSD"
-SLOT="3/29"
-IUSE="doc large-stack python test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-# blocker due to file collision #803347
-RDEPEND="
- !dev-libs/imath:0
- !media-libs/ilmbase
- sys-libs/zlib
- python? (
- !dev-python/pyilmbase
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- ')
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- doc? ( $(python_gen_cond_dep 'dev-python/breathe[${PYTHON_USEDEP}]') )
- python? ( ${PYTHON_DEPS} )
-"
-
-DOCS=( CHANGES.md CONTRIBUTORS.md README.md SECURITY.md
docs/PortingGuide2-3.md )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DDOCS=$(usex doc)
- -DIMATH_ENABLE_LARGE_STACK=$(usex large-stack)
- -DIMATH_HALF_USE_LOOKUP_TABLE=ON
- -DIMATH_INSTALL_PKG_CONFIG=ON
- -DIMATH_USE_CLANG_TIDY=OFF
- -DIMATH_USE_NOEXCEPT=ON
- )
- if use python; then
- mycmakeargs+=(
-
[gentoo-commits] repo/gentoo:master commit in: dev-libs/imath/, dev-libs/imath/files/
commit: ab5b20e5ccba9d46e15cd4bea75801f223839a82
Author: Bernd Waibel posteo net>
AuthorDate: Sun Mar 6 09:21:06 2022 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Mar 6 17:30:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab5b20e5
dev-libs/imath: drop ~3.1.3
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/24418
Signed-off-by: Joonas Niilola gentoo.org>
dev-libs/imath/Manifest| 1 -
...1-0001-changes-needed-for-proper-slotting.patch | 162 -
dev-libs/imath/imath-3.1.3-r1.ebuild | 84 ---
dev-libs/imath/imath-3.1.3.ebuild | 76 --
4 files changed, 323 deletions(-)
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index 435be67a7942..eee626f653da 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,2 +1 @@
-DIST imath-3.1.3.tar.gz 570840 BLAKE2B
b037c9bdee87f58c7a2be9dbda52c89c26eba25fe07342710578f9eef4b90a49b9d5dc5451702c960ae94427d7f748b79b81b7fc9ad350d2252e9e4bf6a1d6cc
SHA512
a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75
DIST imath-3.1.4.tar.gz 572214 BLAKE2B
6d67f542256e44f9ba6f30ae7d22a37dbf3cd1e49992fb8b0e2264d51d47e9c2297940b3a484e1f59bd8b251e8ef42d81ae88282d0769c111b3cd84cd0a9354e
SHA512
f9f7d8ec333e6383191543ee927dc40e870a6330225b01070bb93ad3d149c5e31bd5989d4dc52f3321490c1c5a7cab55582c6e42e34ab4ca5723170e7578e286
diff --git
a/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch
b/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch
deleted file mode 100644
index baa6a84bfb83..
---
a/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-From 19073a8ed52dbc02b64be4cb55a6203dbf36707e Mon Sep 17 00:00:00 2001
-From: Bernd Waibel
-Date: Sat, 24 Jul 2021 22:28:34 +0200
-Subject: [PATCH] changes needed for proper slotting
-
-Signed-off-by: Bernd Waibel
- config/CMakeLists.txt | 6 +++---
- config/Imath.pc.in | 4 ++--
- config/LibraryDefine.cmake | 8
- src/python/PyImath.pc.in | 4 ++--
- src/python/PyImathNumpy/CMakeLists.txt | 2 +-
- src/python/config/CMakeLists.txt | 4 ++--
- src/python/config/ModuleDefine.cmake | 6 +++---
- 7 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
-index d51c25b..63cc98d 100644
a/config/CMakeLists.txt
-+++ b/config/CMakeLists.txt
-@@ -60,7 +60,7 @@ include(CMakePackageConfigHelpers)
-
- configure_package_config_file(ImathConfig.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
-
- write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-@@ -70,11 +70,11 @@
write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
-
- install(EXPORT ${PROJECT_NAME}
-- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- FILE ${PROJECT_NAME}Targets.cmake
- NAMESPACE ${PROJECT_NAME}::
- EXPORT_LINK_INTERFACE_LIBRARIES
-diff --git a/config/Imath.pc.in b/config/Imath.pc.in
-index df11cfd..6eb4f40 100644
a/config/Imath.pc.in
-+++ b/config/Imath.pc.in
-@@ -5,7 +5,7 @@
-
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
- includedir=@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: Imath
-@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@
- Requires:
- Conflicts:
- Libs: -L${libdir} -lImath${libsuffix}
--Cflags: -I${includedir} -I${includedir}/Imath
-+Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
-diff --git a/config/LibraryDefine.cmake b/config/LibraryDefine.cmake
-index 4868954..60b6532 100644
a/config/LibraryDefine.cmake
-+++ b/config/LibraryDefine.cmake
-@@ -87,8 +87,8 @@ function(IMATH_DEFINE_LIBRARY libname)
- install(TARGETS ${libname}
- EXPORT ${PROJECT_NAME}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
-+ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
- INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-
[gentoo-commits] repo/gentoo:master commit in: dev-libs/imath/, dev-libs/imath/files/
commit: 92c6ab78a3ccf8f543cbc0e530c7414865750a2f
Author: Bernd Waibel posteo net>
AuthorDate: Mon Oct 11 19:27:23 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Oct 17 02:22:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92c6ab78
dev-libs/imath: drop 3.0.5
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/22559
Signed-off-by: Sam James gentoo.org>
dev-libs/imath/Manifest| 1 -
...5-0001-changes-needed-for-proper-slotting.patch | 161 -
dev-libs/imath/imath-3.0.5-r1.ebuild | 94
3 files changed, 256 deletions(-)
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index 84c2392f3c3..02adfd733ca 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1,3 +1,2 @@
-DIST imath-3.0.5.tar.gz 528503 BLAKE2B
c1fcb199a81aff25f1ad26ccfcef2802861401f3fee5dc24035216aa16fd9a5344ec6c37139a0850f1a4bc580dc1fdd068eca9473a19e4aaf329cfc5f53a4cd6
SHA512
df206315d822266cf32a5a4399abff7ad1dd0bd1f0372d61f61516e2acdefd13e3cfd9cf54373a3fb49bb28c9f80915ca5ecaec2a068a1d6ea231d71a5316da2
DIST imath-3.1.1.tar.gz 568231 BLAKE2B
a1210b5f6ff4723a133d317c2b40338e387973a1409868a218192a53778b86a0912c77911bdf76286a6ed6931175aec38bf24ddc0c76eed3375b7a2945dba124
SHA512
b2f4cc21e44094ef139a1f04bb997c7e41770ff886457fff00d65ca477ba579c86fd5fbd465998c4519855fcb34328ac834d84d0d011f758f56a20ef79e9ca3d
DIST imath-3.1.3.tar.gz 570840 BLAKE2B
b037c9bdee87f58c7a2be9dbda52c89c26eba25fe07342710578f9eef4b90a49b9d5dc5451702c960ae94427d7f748b79b81b7fc9ad350d2252e9e4bf6a1d6cc
SHA512
a11f5e736bc49098d735c7903f186c15b03efbec082a8cf2e6635546368035cec0d36c7ae64bfd01bd8eeffb2dd247b8dab19e440a3e1fe33008edacc1268f75
diff --git
a/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch
b/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch
deleted file mode 100644
index 74d0f2dff7d..000
---
a/dev-libs/imath/files/imath-3.0.5-0001-changes-needed-for-proper-slotting.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From: Bernd Waibel
-Date: Tue, 20 Jul 2021 19:18:20 +0200
-Subject: [PATCH] changes needed for proper slotting
-
-Signed-off-by: Bernd Waibel
- config/CMakeLists.txt | 6 +++---
- config/Imath.pc.in | 4 ++--
- config/LibraryDefine.cmake | 8
- src/python/PyImath.pc.in | 4 ++--
- src/python/PyImathNumpy/CMakeLists.txt | 2 +-
- src/python/config/CMakeLists.txt | 4 ++--
- src/python/config/ModuleDefine.cmake | 6 +++---
- 7 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
-index d51c25b..63cc98d 100644
a/config/CMakeLists.txt
-+++ b/config/CMakeLists.txt
-@@ -60,7 +60,7 @@ include(CMakePackageConfigHelpers)
-
- configure_package_config_file(ImathConfig.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
-- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
-
- write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-@@ -70,11 +70,11 @@
write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
- ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- )
-
- install(EXPORT ${PROJECT_NAME}
-- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
- FILE ${PROJECT_NAME}Targets.cmake
- NAMESPACE ${PROJECT_NAME}::
- EXPORT_LINK_INTERFACE_LIBRARIES
-diff --git a/config/Imath.pc.in b/config/Imath.pc.in
-index df11cfd..6eb4f40 100644
a/config/Imath.pc.in
-+++ b/config/Imath.pc.in
-@@ -5,7 +5,7 @@
-
- prefix=@prefix@
- exec_prefix=@exec_prefix@
--libdir=@libdir@
-+libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
- includedir=@includedir@
- libsuffix=@LIB_SUFFIX_DASH@
- Name: Imath
-@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@
- Requires:
- Conflicts:
- Libs: -L${libdir} -lImath${libsuffix}
--Cflags: -I${includedir} -I${includedir}/Imath
-+Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
-diff --git a/config/LibraryDefine.cmake b/config/LibraryDefine.cmake
-index e9ff904..00e5176 100644
a/config/LibraryDefine.cmake
-+++ b/config/LibraryDefine.cmake
-@@ -74,8 +74,8 @@ function(IMATH_DEFINE_LIBRARY libname)
- install(TARGETS ${libname}
- EXPORT ${PROJECT_NAME}
- RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
--LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
--ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+LIBRARY DESTINATION
[gentoo-commits] repo/gentoo:master commit in: dev-libs/imath/, dev-libs/imath/files/
commit: 06799a550f46ca1e22380b0ade02f526e98d6bcf
Author: Bernd Waibel posteo net>
AuthorDate: Sat Jul 24 20:09:13 2021 +
Commit: Joonas Niilola gentoo org>
CommitDate: Sun Aug 1 06:39:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06799a55
dev-libs/imath: bump to 3.1.1
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21774
Signed-off-by: Joonas Niilola gentoo.org>
dev-libs/imath/Manifest| 1 +
...1-0001-changes-needed-for-proper-slotting.patch | 162 +
dev-libs/imath/imath-3.1.1.ebuild | 92
3 files changed, 255 insertions(+)
diff --git a/dev-libs/imath/Manifest b/dev-libs/imath/Manifest
index 1cdecf3c54b..5190cfb234c 100644
--- a/dev-libs/imath/Manifest
+++ b/dev-libs/imath/Manifest
@@ -1 +1,2 @@
DIST imath-3.0.5.tar.gz 528503 BLAKE2B
c1fcb199a81aff25f1ad26ccfcef2802861401f3fee5dc24035216aa16fd9a5344ec6c37139a0850f1a4bc580dc1fdd068eca9473a19e4aaf329cfc5f53a4cd6
SHA512
df206315d822266cf32a5a4399abff7ad1dd0bd1f0372d61f61516e2acdefd13e3cfd9cf54373a3fb49bb28c9f80915ca5ecaec2a068a1d6ea231d71a5316da2
+DIST imath-3.1.1.tar.gz 568231 BLAKE2B
a1210b5f6ff4723a133d317c2b40338e387973a1409868a218192a53778b86a0912c77911bdf76286a6ed6931175aec38bf24ddc0c76eed3375b7a2945dba124
SHA512
b2f4cc21e44094ef139a1f04bb997c7e41770ff886457fff00d65ca477ba579c86fd5fbd465998c4519855fcb34328ac834d84d0d011f758f56a20ef79e9ca3d
diff --git
a/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch
b/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch
new file mode 100644
index 000..baa6a84bfb8
--- /dev/null
+++
b/dev-libs/imath/files/imath-3.1.1-0001-changes-needed-for-proper-slotting.patch
@@ -0,0 +1,162 @@
+From 19073a8ed52dbc02b64be4cb55a6203dbf36707e Mon Sep 17 00:00:00 2001
+From: Bernd Waibel
+Date: Sat, 24 Jul 2021 22:28:34 +0200
+Subject: [PATCH] changes needed for proper slotting
+
+Signed-off-by: Bernd Waibel
+---
+ config/CMakeLists.txt | 6 +++---
+ config/Imath.pc.in | 4 ++--
+ config/LibraryDefine.cmake | 8
+ src/python/PyImath.pc.in | 4 ++--
+ src/python/PyImathNumpy/CMakeLists.txt | 2 +-
+ src/python/config/CMakeLists.txt | 4 ++--
+ src/python/config/ModuleDefine.cmake | 6 +++---
+ 7 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
+index d51c25b..63cc98d 100644
+--- a/config/CMakeLists.txt
b/config/CMakeLists.txt
+@@ -60,7 +60,7 @@ include(CMakePackageConfigHelpers)
+
+ configure_package_config_file(ImathConfig.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+ )
+
+ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+@@ -70,11 +70,11 @@
write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+ )
+
+ install(EXPORT ${PROJECT_NAME}
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${IMATH_OUTPUT_SUBDIR}
+ FILE ${PROJECT_NAME}Targets.cmake
+ NAMESPACE ${PROJECT_NAME}::
+ EXPORT_LINK_INTERFACE_LIBRARIES
+diff --git a/config/Imath.pc.in b/config/Imath.pc.in
+index df11cfd..6eb4f40 100644
+--- a/config/Imath.pc.in
b/config/Imath.pc.in
+@@ -5,7 +5,7 @@
+
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=@libdir@/@IMATH_OUTPUT_SUBDIR@
+ includedir=@includedir@
+ libsuffix=@LIB_SUFFIX_DASH@
+ Name: Imath
+@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@
+ Requires:
+ Conflicts:
+ Libs: -L${libdir} -lImath${libsuffix}
+-Cflags: -I${includedir} -I${includedir}/Imath
++Cflags: -I${includedir} -I${includedir}/@IMATH_OUTPUT_SUBDIR@
+diff --git a/config/LibraryDefine.cmake b/config/LibraryDefine.cmake
+index 4868954..60b6532 100644
+--- a/config/LibraryDefine.cmake
b/config/LibraryDefine.cmake
+@@ -87,8 +87,8 @@ function(IMATH_DEFINE_LIBRARY libname)
+ install(TARGETS ${libname}
+ EXPORT ${PROJECT_NAME}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+-LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+-ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
++ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${IMATH_OUTPUT_SUBDIR}
+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ PUBLIC_HEADER
+ DESTINATION
