summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernd Waibel <waebbl@gmail.com>2019-06-15 18:14:40 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-06-16 23:50:54 +0200
commit60e0198a5d2d01c38f27fba747a7fd389a835198 (patch)
tree6113e082f573b1a6d9a460f061df0385da97269a /media-gfx/alembic/files
parentapp-emulation/buildah: Bump to version 1.9.0 (diff)
downloadgentoo-60e0198a5d2d01c38f27fba747a7fd389a835198.tar.gz
gentoo-60e0198a5d2d01c38f27fba747a7fd389a835198.tar.bz2
gentoo-60e0198a5d2d01c38f27fba747a7fd389a835198.zip
media-gfx/alembic: bump to version 1.7.11
Closes: https://bugs.gentoo.org/688114 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Bernd Waibel <waebbl@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/12258 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-gfx/alembic/files')
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch60
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch72
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch29
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch27
-rw-r--r--media-gfx/alembic/files/alembic-1.7.11-0005-Fix-install-locations.patch218
5 files changed, 406 insertions, 0 deletions
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch b/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch
new file mode 100644
index 000000000000..d36e2503427f
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch
@@ -0,0 +1,60 @@
+From 2060f95c43685895f36269667c30acf7499b81b6 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sat, 15 Jun 2019 13:19:57 +0200
+Subject: [PATCH 1/5] Fix to find boost with >=cmake-3.11
+
+Cmake version 3.11 and later has a new syntax introduced, when
+looking for boost libraries.
+This patches adds this syntax if an appropriate cmake version is used.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ cmake/AlembicBoost.cmake | 10 +++++++++-
+ python/PyAlembic/CMakeLists.txt | 8 ++++----
+ 2 files changed, 13 insertions(+), 5 deletions(-)
+
+diff --git a/cmake/AlembicBoost.cmake b/cmake/AlembicBoost.cmake
+index 21b3515..db59157 100644
+--- a/cmake/AlembicBoost.cmake
++++ b/cmake/AlembicBoost.cmake
+@@ -79,7 +79,15 @@ IF (USE_PYALEMBIC AND APPLE)
+ ENDIF()
+
+ IF (USE_PYALEMBIC)
+- FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
++ # cmake>=3.11 has a new syntax when searching for boost, which
++ # needs to add the python version.
++ # Hardcode the python version number, as PYTHON_VERSION_{MAJOR,MINOR}
++ # are not yet know in the configuration phase.
++ IF(CMAKE_MINOR_VERSION VERSION_GREATER 10)
++ FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python27)
++ ELSE()
++ FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
++ ENDIF()
+ ELSE()
+ FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options)
+ ENDIF()
+diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
+index a3fdb31..af8dcb5 100644
+--- a/python/PyAlembic/CMakeLists.txt
++++ b/python/PyAlembic/CMakeLists.txt
+@@ -33,12 +33,12 @@
+ ##
+ ##-*****************************************************************************
+
+-MESSAGE(STATUS "Boost_PYTHON_LIBRARY: ${Boost_PYTHON_LIBRARY}")
++MESSAGE(STATUS "Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY: ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE}")
+
+ # set core libs
+-IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
+- MESSAGE(STATUS "Found libboost_python: ${Boost_PYTHON_LIBRARY}")
+- SET(PLIBS ${ALEMBIC_PYTHON_LIBRARY} ${Boost_PYTHON_LIBRARY})
++IF (Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE AND ALEMBIC_PYTHON_LIBRARY)
++ MESSAGE(STATUS "Found libboost_python: ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE}")
++ SET(PLIBS ${ALEMBIC_PYTHON_LIBRARY} ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE})
+
+ # lots of warnings coming from unused local typedefs inside boost python
+ IF (NOT WINDOWS)
+--
+2.22.0
+
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch b/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch
new file mode 100644
index 000000000000..c561e26a6656
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch
@@ -0,0 +1,72 @@
+From 60bbcde225f3c28a36d8643c451509d9deb09222 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sat, 15 Jun 2019 13:34:09 +0200
+Subject: [PATCH 2/5] Find IlmBase by setting a proper ILMBASE_ROOT value and
+ by using pkg-config to determine the installed ilmbase version, instead of
+ using the cmake STRINGS command.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ cmake/Modules/FindIlmBase.cmake | 18 +++++++++++++++++-
+ cmake/Modules/FindPyIlmBase.cmake | 2 +-
+ 2 files changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/Modules/FindIlmBase.cmake b/cmake/Modules/FindIlmBase.cmake
+index 679a02f..0fe2b1a 100644
+--- a/cmake/Modules/FindIlmBase.cmake
++++ b/cmake/Modules/FindIlmBase.cmake
+@@ -52,7 +52,7 @@ IF(NOT DEFINED ILMBASE_ROOT)
+ SET( ALEMBIC_ILMBASE_ROOT NOTFOUND )
+ ELSE()
+ # TODO: set to default install path when shipping out
+- SET( ALEMBIC_ILMBASE_ROOT "/usr/local/ilmbase-1.0.1/" )
++ SET( ALEMBIC_ILMBASE_ROOT "/usr" )
+ ENDIF()
+ ELSE()
+ IF ( ${WINDOWS} )
+@@ -87,6 +87,21 @@ SET(_ilmbase_SEARCH_DIRS
+ /usr/freeware
+ )
+
++# use pkg-config to determine the correct version
++include(FindPkgConfig)
++IF(PKG_CONFIG_FOUND)
++ PKG_CHECK_MODULES(PC_ILMBASE QUIET IlmBase)
++ IF(PC_ILMBASE_FOUND)
++ SET(ILMBASE_VERSION ${PC_ILMBASE_VERSION})
++ SET(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${PC_ILMBASE_INCLUDE_DIRS})
++ STRING(REGEX MATCH "-lHalf" ALEMBIC_ILMBASE_HALF_LIB ${PC_ILMBASE_LDFLAGS})
++ STRING(REGEX MATCH "-lIex" ALEMBIC_ILMBASE_IEX_LIB ${PC_ILMBASE_LDFLAGS})
++ STRING(REGEX MATCH "-lIexMath" ALEMBIC_ILMBASE_IEXMATH_LIB ${PC_ILMBASE_LDFLAGS})
++ STRING(REGEX MATCH "-lIlmThread" ALEMBIC_ILMBASE_ILMTHREAD_LIB ${PC_ILMBASE_LDFLAGS})
++ String(REGEX MATCH "-lImath" ALEMBIC_ILMBASE_IMATH_LIB ${PC_ILMBASE_LDFLAGS})
++ ENDIF()
++ELSE(PKG_CONFIG_FOUND)
++
+ FIND_PATH(ILMBASE_INCLUDE_DIR
+ NAMES
+ IlmBaseConfig.h
+@@ -179,6 +194,7 @@ IF ( ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY} STREQUAL "ALEMBIC_ILMBASE_INCLUDE_DIRE
+ MESSAGE( FATAL_ERROR "ilmbase header files not found, required: ALEMBIC_ILMBASE_ROOT: ${ALEMBIC_ILMBASE_ROOT}" )
+ ENDIF()
+
++ENDIF(PKG_CONFIG_FOUND)
+
+ MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" )
+ MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" )
+diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
+index d55f8d3..b5f3cb5 100644
+--- a/cmake/Modules/FindPyIlmBase.cmake
++++ b/cmake/Modules/FindPyIlmBase.cmake
+@@ -44,7 +44,7 @@ ELSE()
+ SET(ALEMBIC_PYILMBASE_ROOT NOTFOUND)
+ ELSE()
+ # TODO: set to default install path when shipping out
+- SET(ALEMBIC_PYILMBASE_ROOT "/usr/local/pyilmbase/")
++ SET(ALEMBIC_PYILMBASE_ROOT "/usr")
+ ENDIF()
+ ELSE()
+ IF (${WINDOWS})
+--
+2.22.0
+
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch b/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch
new file mode 100644
index 000000000000..9777bad13e8b
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch
@@ -0,0 +1,29 @@
+From 3ca71af0e83fce89df0bfb472b28abe3c4e08c57 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sat, 15 Jun 2019 15:13:03 +0200
+Subject: [PATCH 3/5] Fix env var for renderman. This is called RMANTREE on
+ linux.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ cmake/AlembicPRMan.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/AlembicPRMan.cmake b/cmake/AlembicPRMan.cmake
+index e02b237..fdbf26c 100644
+--- a/cmake/AlembicPRMan.cmake
++++ b/cmake/AlembicPRMan.cmake
+@@ -66,8 +66,8 @@ ELSE()
+ ENDIF()
+
+ # Prefer PRMAN_ROOT set from the environment over the CMakeCache'd variable
+-IF(NOT $ENV{PRMAN_ROOT}x STREQUAL "x")
+- SET( ALEMBIC_PRMAN_ROOT $ENV{PRMAN_ROOT})
++IF(NOT $ENV{RMANTREE}x STREQUAL "x")
++ SET( ALEMBIC_PRMAN_ROOT $ENV{RMANTREE})
+ ENDIF()
+
+
+--
+2.22.0
+
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch b/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch
new file mode 100644
index 000000000000..73e989ba6a6f
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch
@@ -0,0 +1,27 @@
+From d1895084e41970c8f91e9357fcb739ac29c47109 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sat, 15 Jun 2019 16:19:30 +0200
+Subject: [PATCH 4/5] WriteGeo.cpp: Fix a compile issue, where an invalid
+ conversion from char* to const char* took place.
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ prman/Procedural/WriteGeo.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/prman/Procedural/WriteGeo.cpp b/prman/Procedural/WriteGeo.cpp
+index 95b4867..5ad0b71 100644
+--- a/prman/Procedural/WriteGeo.cpp
++++ b/prman/Procedural/WriteGeo.cpp
+@@ -898,7 +898,7 @@ void ProcessCurves( ICurves &curves, ProcArgs &args )
+ void WriteIdentifier( const ObjectHeader &ohead )
+ {
+ std::string name = ohead.getFullName();
+- char* nameArray[] = { const_cast<char*>( name.c_str() ), RI_NULL };
++ const char* nameArray[] = { const_cast<char*>( name.c_str() ), RI_NULL };
+
+ RiAttribute(const_cast<char*>( "identifier" ), const_cast<char*>( "name" ),
+ nameArray, RI_NULL );
+--
+2.22.0
+
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0005-Fix-install-locations.patch b/media-gfx/alembic/files/alembic-1.7.11-0005-Fix-install-locations.patch
new file mode 100644
index 000000000000..ec3c01d10764
--- /dev/null
+++ b/media-gfx/alembic/files/alembic-1.7.11-0005-Fix-install-locations.patch
@@ -0,0 +1,218 @@
+From a867fa646d7af98fe57c9d6c96a407e648fbca24 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sat, 15 Jun 2019 16:39:50 +0200
+Subject: [PATCH 5/5] Fix install locations
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ CMakeLists.txt | 8 ++++----
+ arnold/Procedural/CMakeLists.txt | 2 +-
+ bin/AbcConvert/CMakeLists.txt | 2 +-
+ bin/AbcDiff/CMakeLists.txt | 2 +-
+ bin/AbcEcho/CMakeLists.txt | 2 +-
+ bin/AbcLs/CMakeLists.txt | 2 +-
+ bin/AbcStitcher/CMakeLists.txt | 2 +-
+ bin/AbcTree/CMakeLists.txt | 2 +-
+ lib/Alembic/CMakeLists.txt | 4 ++--
+ maya/AbcExport/CMakeLists.txt | 2 +-
+ maya/AbcImport/CMakeLists.txt | 2 +-
+ prman/Procedural/CMakeLists.txt | 4 ++--
+ python/PyAlembic/CMakeLists.txt | 4 ++--
+ 13 files changed, 19 insertions(+), 19 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 51a95d7..0622613 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -80,12 +80,12 @@ OPTION(ALEMBIC_LIB_USES_TR1
+
+ # Set static/dynamic build options
+ SET(LIB_TYPE STATIC)
+-SET(RUNTIME_INSTALL_DIR lib)
+-SET(LIBRARY_INSTALL_DIR lib)
+-SET(ARCHIVE_INSTALL_DIR lib)
++SET(RUNTIME_INSTALL_DIR lib${LIB_SUFFIX})
++SET(LIBRARY_INSTALL_DIR lib${LIB_SUFFIX})
++SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
+ IF (ALEMBIC_SHARED_LIBS)
+ SET(LIB_TYPE SHARED)
+- SET(ARCHIVE_INSTALL_DIR lib)
++ SET(ARCHIVE_INSTALL_DIR lib${LIB_SUFFIX})
+ IF (WIN32)
+ ADD_DEFINITIONS(-DALEMBIC_DLL)
+ ENDIF()
+diff --git a/arnold/Procedural/CMakeLists.txt b/arnold/Procedural/CMakeLists.txt
+index 69e00da..027e646 100644
+--- a/arnold/Procedural/CMakeLists.txt
++++ b/arnold/Procedural/CMakeLists.txt
+@@ -60,7 +60,7 @@ TARGET_LINK_LIBRARIES( AlembicArnoldProcedural Alembic::Alembic)
+
+ set_target_properties(AlembicArnoldProcedural PROPERTIES
+ INSTALL_RPATH_USE_LINK_PATH TRUE
+- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+
+ INSTALL ( TARGETS
+ AlembicArnoldProcedural
+diff --git a/bin/AbcConvert/CMakeLists.txt b/bin/AbcConvert/CMakeLists.txt
+index 451409c..5b41a14 100644
+--- a/bin/AbcConvert/CMakeLists.txt
++++ b/bin/AbcConvert/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcconvert Alembic::Alembic)
+
+ set_target_properties(abcconvert PROPERTIES
+ INSTALL_RPATH_USE_LINK_PATH TRUE
+- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+
+ INSTALL(TARGETS abcconvert DESTINATION bin)
+diff --git a/bin/AbcDiff/CMakeLists.txt b/bin/AbcDiff/CMakeLists.txt
+index 511864a..c9cf482 100644
+--- a/bin/AbcDiff/CMakeLists.txt
++++ b/bin/AbcDiff/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcdiff Alembic::Alembic)
+
+ set_target_properties(abcdiff PROPERTIES
+ INSTALL_RPATH_USE_LINK_PATH TRUE
+- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+
+ INSTALL(TARGETS abcdiff DESTINATION bin)
+diff --git a/bin/AbcEcho/CMakeLists.txt b/bin/AbcEcho/CMakeLists.txt
+index be5f5c1..3020041 100644
+--- a/bin/AbcEcho/CMakeLists.txt
++++ b/bin/AbcEcho/CMakeLists.txt
+@@ -41,6 +41,6 @@ TARGET_LINK_LIBRARIES(abcechobounds Alembic::Alembic)
+
+ set_target_properties(abcecho abcechobounds PROPERTIES
+ INSTALL_RPATH_USE_LINK_PATH TRUE
+- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+
+ INSTALL(TARGETS abcecho abcechobounds DESTINATION bin)
+diff --git a/bin/AbcLs/CMakeLists.txt b/bin/AbcLs/CMakeLists.txt
+index 815f84f..cd216e4 100644
+--- a/bin/AbcLs/CMakeLists.txt
++++ b/bin/AbcLs/CMakeLists.txt
+@@ -39,6 +39,6 @@ TARGET_LINK_LIBRARIES(abcls Alembic::Alembic)
+
+ set_target_properties(abcls PROPERTIES
+ INSTALL_RPATH_USE_LINK_PATH TRUE
+- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+
+ INSTALL(TARGETS abcls DESTINATION bin)
+diff --git a/bin/AbcStitcher/CMakeLists.txt b/bin/AbcStitcher/CMakeLists.txt
+index a963420..5882287 100644
+--- a/bin/AbcStitcher/CMakeLists.txt
++++ b/bin/AbcStitcher/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abcstitcher Alembic::Alembic)
+
+ set_target_properties(abcstitcher PROPERTIES
+ INSTALL_RPATH_USE_LINK_PATH TRUE
+- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+
+ INSTALL(TARGETS abcstitcher DESTINATION bin)
+diff --git a/bin/AbcTree/CMakeLists.txt b/bin/AbcTree/CMakeLists.txt
+index b4f65f1..841e1d2 100644
+--- a/bin/AbcTree/CMakeLists.txt
++++ b/bin/AbcTree/CMakeLists.txt
+@@ -38,6 +38,6 @@ TARGET_LINK_LIBRARIES(abctree Alembic::Alembic)
+
+ set_target_properties(abctree PROPERTIES
+ INSTALL_RPATH_USE_LINK_PATH TRUE
+- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+
+ INSTALL(TARGETS abctree DESTINATION bin)
+diff --git a/lib/Alembic/CMakeLists.txt b/lib/Alembic/CMakeLists.txt
+index e4d33cb..e43dcce 100644
+--- a/lib/Alembic/CMakeLists.txt
++++ b/lib/Alembic/CMakeLists.txt
+@@ -85,7 +85,7 @@ IF ( ${ALEMBIC_LIB_USES_TR1} AND CMAKE_COMPILER_IS_GNUCXX AND
+ TARGET_LINK_LIBRARIES( Alembic atomic )
+ ENDIF()
+
+-SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE PATH "Where to install the Alembic libs")
++SET( ALEMBIC_LIB_INSTALL_DIR lib${LIB_SUFFIX} CACHE PATH "Where to install the Alembic libs")
+ INSTALL(TARGETS Alembic
+ EXPORT AlembicTargets
+ LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
+@@ -118,7 +118,7 @@ EXPORT(TARGETS
+ Alembic::
+ )
+
+-SET(ConfigPackageLocation lib/cmake/Alembic CACHE PATH
++SET(ConfigPackageLocation lib${LIB_SUFFIX}/cmake/Alembic CACHE PATH
+ "Where to install the Alembic's cmake files")
+
+ INSTALL(FILES
+diff --git a/maya/AbcExport/CMakeLists.txt b/maya/AbcExport/CMakeLists.txt
+index 50d2fd2..b4ce46d 100644
+--- a/maya/AbcExport/CMakeLists.txt
++++ b/maya/AbcExport/CMakeLists.txt
+@@ -77,7 +77,7 @@ TARGET_LINK_LIBRARIES(AbcExport
+
+ set_target_properties(AbcExport PROPERTIES
+ INSTALL_RPATH_USE_LINK_PATH TRUE
+- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+
+ INSTALL(TARGETS AbcExport
+ DESTINATION ${ALEMBIC_MAYA_PLUGINS_INSTALL_DIR})
+diff --git a/maya/AbcImport/CMakeLists.txt b/maya/AbcImport/CMakeLists.txt
+index 6826183..5a5efad 100644
+--- a/maya/AbcImport/CMakeLists.txt
++++ b/maya/AbcImport/CMakeLists.txt
+@@ -81,7 +81,7 @@ TARGET_LINK_LIBRARIES(AbcImport
+
+ set_target_properties(AbcImport PROPERTIES
+ INSTALL_RPATH_USE_LINK_PATH TRUE
+- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+
+ INSTALL(TARGETS AbcImport
+ DESTINATION ${ALEMBIC_MAYA_PLUGINS_INSTALL_DIR})
+diff --git a/prman/Procedural/CMakeLists.txt b/prman/Procedural/CMakeLists.txt
+index 6b46e91..c774c2a 100644
+--- a/prman/Procedural/CMakeLists.txt
++++ b/prman/Procedural/CMakeLists.txt
+@@ -60,10 +60,10 @@ TARGET_LINK_LIBRARIES(AlembicRiProcedural Alembic::Alembic)
+
+ set_target_properties(AlembicRiProcedural PROPERTIES
+ INSTALL_RPATH_USE_LINK_PATH TRUE
+- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+
+ INSTALL(TARGETS
+ AlembicRiProcedural
+ DESTINATION
+- prman/procedurals
++ $ENV{RMANTREE}/lib/plugins
+ )
+diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
+index af8dcb5..90f7428 100644
+--- a/python/PyAlembic/CMakeLists.txt
++++ b/python/PyAlembic/CMakeLists.txt
+@@ -141,7 +141,7 @@ IF (Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE A
+ )
+
+ SET( ALEMBIC_PYTHON_INSTALL_DIR
+- lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
++ lib${LIB_SUFFIX}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages
+ CACHE PATH
+ "Alembic's python bindings install directory"
+ )
+@@ -156,7 +156,7 @@ IF (Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE A
+
+ set_target_properties(PyAlembic PROPERTIES
+ INSTALL_RPATH_USE_LINK_PATH TRUE
+- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
++ INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
+ ELSE()
+ MESSAGE(FATAL_ERROR "Unable to find Python libs")
+ ENDIF()
+--
+2.22.0
+