Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions imath.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: imath
version: "3.2.0"
version: "3.2.1"
epoch: 0
description: C++ and python library of 2D and 3D vector, matrix, and math operations for computer graphics
copyright:
Expand All @@ -25,7 +25,7 @@ pipeline:
- uses: git-checkout
with:
repository: https://github.com/AcademySoftwareFoundation/Imath
expected-commit: 9ff104bd3a40b8c3f811fdbd3f217c32d45e4a11
expected-commit: fbcfb9833fe78277299080e8700fcf749a468bb0
tag: v${{package.version}}

# by default, CMake will use the first libboost_python .so file it encounters
Expand Down
7 changes: 3 additions & 4 deletions imath/fix_python_selection.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
index a384e7f..2bbcbf9 100644
index 43c8eb2..5e0cd3c 100644
--- a/src/python/CMakeLists.txt
+++ b/src/python/CMakeLists.txt
@@ -13,7 +13,7 @@ if(NOT Python3_FOUND)
message(FATAL_ERROR "Could not find Python")
endif()

-find_package(Boost REQUIRED COMPONENTS python)
+find_package(Boost REQUIRED COMPONENTS python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})
-find_package(Boost CONFIG REQUIRED COMPONENTS python)
+find_package(Boost CONFIG REQUIRED COMPONENTS python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})

if(NOT Boost_FOUND)
message(FATAL_ERROR "Could not find Boost")
Expand Down Expand Up @@ -36,4 +36,3 @@ index c0d80fd..1e6531b 100644
+find_package(Boost REQUIRED COMPONENTS python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR})

find_package(Imath COMPONENTS PyImath)

Loading