Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
7 changes: 7 additions & 0 deletions recipes/opensubdiv/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
sources:
"3.7.0":
url: "https://github.com/PixarAnimationStudios/OpenSubdiv/archive/refs/tags/v3_7_0.tar.gz"
sha256: "f843eb49daf20264007d807cbc64516a1fed9cdb1149aaf84ff47691d97491f9"
"3.6.0":
url: "https://github.com/PixarAnimationStudios/OpenSubdiv/archive/refs/tags/v3_6_0.tar.gz"
sha256: "bebfd61ab6657a4f4ff27845fb66a167d00395783bfbd253254d87447ed1d879"
Expand All @@ -9,6 +12,10 @@ sources:
url: "https://github.com/PixarAnimationStudios/OpenSubdiv/archive/refs/tags/v3_4_4.tar.gz"
sha256: "20d49f80a2b778ad4d01f091ad88d8c2f91cf6c7363940c6213241ce6f1048fb"
patches:
"3.7.0":
- patch_file: "patches/3.7.0-0001-cmake-no-rpath.patch"
patch_description: "CMake: do not populate rpath with absolute paths"
patch_type: "conan"
"3.6.0":
- patch_file: "patches/3.6.0-0002-cmake-no-rpath.patch"
patch_description: "CMake: do not populate rpath with absolute paths"
Expand Down
2 changes: 1 addition & 1 deletion recipes/opensubdiv/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class OpenSubdivConan(ConanFile):
"with_clew": False,
"with_opencl": False,
"with_dx": False,
"with_metal": True
"with_metal": False
}

short_paths = True
Expand Down
24 changes: 24 additions & 0 deletions recipes/opensubdiv/all/patches/3.7.0-0001-cmake-no-rpath.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b82773a1..bab1bdac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,19 +134,6 @@ elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Intel")
set(CMAKE_COMPILER_IS_ICC 1)
endif()

-
-if (NOT CMAKE_COMPILER_IS_ICC)
- # Currently icc has a bug that asserts when linking rpaths containing long
- # sequences of ':' that this command causes. The consequence is that examples
- # built and installed using icc will not have an rpath pointing to the built
- # OSD library which they depend on and will have to set LD_LIBRARY_PATH instead.
- list(APPEND CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-endif()
-
-# add the automatically determined parts of the RPATH
-# which point to directories outside the build tree to the install RPATH
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-
# ensure that ARC is shown as enabled in the Xcode UI
if(CMAKE_GENERATOR STREQUAL "Xcode")
set (CMAKE_XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC "YES")
2 changes: 2 additions & 0 deletions recipes/opensubdiv/config.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
versions:
"3.7.0":
folder: all
"3.6.0":
folder: all
"3.5.0":
Expand Down