Skip to content

Commit

Permalink
(#18719) Add Alembic 1.8.5
Browse files Browse the repository at this point in the history
* Add Alembic 1.8.5

* Update recipes/alembic/all/patches/1.8.5-0001-fix-cmake.patch

Co-authored-by: Martin Valgur <martin.valgur@gmail.com>

* Update 1.8.5-0001-fix-cmake.patch

Co-authored-by: Martin Valgur <martin.valgur@gmail.com>

---------

Co-authored-by: Martin Valgur <martin.valgur@gmail.com>
Co-authored-by: Uilian Ries <uilianries@gmail.com>
  • Loading branch information
3 people authored Aug 11, 2023
1 parent d05b789 commit 49ccd98
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 0 deletions.
7 changes: 7 additions & 0 deletions recipes/alembic/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
sources:
"1.8.5":
url: "https://github.com/alembic/alembic/archive/1.8.5.tar.gz"
sha256: "180a12f08d391cd89f021f279dbe3b5423b1db751a9898540c8059a45825c2e9"
"1.8.3":
url: "https://github.com/alembic/alembic/archive/1.8.3.tar.gz"
sha256: "b0bc74833bff118a869e81e6acb810a58797e77ef63143954b2f8e817c7f65cb"
"1.8.2":
url: "https://github.com/alembic/alembic/archive/refs/tags/1.8.2.tar.gz"
sha256: "3f1c466ee1600578689b32b1f2587066d3259704ec7ed1fcf80c324d01274f48"
patches:
"1.8.5":
- patch_file: "patches/1.8.5-0001-fix-cmake.patch"
patch_description: "Disable a line in a CMakeLists.txt to build with shared=True"
patch_type: "portability"
"1.8.3":
- patch_file: "patches/1.8.2-0001-fix-cmake.patch"
"1.8.2":
Expand Down
26 changes: 26 additions & 0 deletions recipes/alembic/all/patches/1.8.5-0001-fix-cmake.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
--- a/lib/Alembic/CMakeLists.txt
+++ b/lib/Alembic/CMakeLists.txt
@@ -68,7 +68,6 @@ IF (ALEMBIC_SHARED_LIBS)

if (ALEMBIC_USING_IMATH_3)
if (APPLE OR UNIX)
- set_target_properties(Alembic PROPERTIES INSTALL_RPATH "$<TARGET_FILE_DIR:${ALEMBIC_ILMBASE_LIBS}>")
endif ()
endif ()
ENDIF()
@@ -87,9 +87,9 @@ TARGET_LINK_LIBRARIES(Alembic
SET( ALEMBIC_LIB_INSTALL_DIR lib CACHE STRING "Where to install the Alembic libs")
INSTALL(TARGETS Alembic
EXPORT AlembicTargets
- LIBRARY DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
- ARCHIVE DESTINATION ${ALEMBIC_LIB_INSTALL_DIR}
- RUNTIME DESTINATION ${ALEMBIC_LIB_INSTALL_DIR})
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

#-******************************************************************************
# PACKAGE EXPORTS
--
2.41.0

2 changes: 2 additions & 0 deletions recipes/alembic/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"1.8.5":
folder: all
"1.8.3":
folder: all
"1.8.2":
Expand Down

0 comments on commit 49ccd98

Please sign in to comment.