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
24 changes: 7 additions & 17 deletions recipes/opensubdiv/all/conandata.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
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"
"3.5.0":
url: "https://github.com/PixarAnimationStudios/OpenSubdiv/archive/refs/tags/v3_5_0.tar.gz"
sha256: "8f5044f453b94162755131f77c08069004f25306fd6dc2192b6d49889efb8095"
"3.4.4":
url: "https://github.com/PixarAnimationStudios/OpenSubdiv/archive/refs/tags/v3_4_4.tar.gz"
sha256: "20d49f80a2b778ad4d01f091ad88d8c2f91cf6c7363940c6213241ce6f1048fb"
patches:
"3.6.0":
- patch_file: "patches/3.6.0-0002-cmake-no-rpath.patch"
patch_description: "CMake: do not populate rpath with absolute paths"
patch_type: "conan"
"3.5.0":
- patch_file: "patches/3.4.4-0002-cmake-no-rpath.patch"
"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.4.4":
- patch_file: "patches/3.4.4-0001-cmake-minimum-required.patch"
patch_description: "CMake: Fix position of cmake_minimum_required()"
patch_type: "conan"
- patch_file: "patches/3.4.4-0002-cmake-no-rpath.patch"
"3.6.0":
- patch_file: "patches/3.6.0-0002-cmake-no-rpath.patch"
patch_description: "CMake: do not populate rpath with absolute paths"
patch_type: "conan"
2 changes: 2 additions & 0 deletions recipes/opensubdiv/all/conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ def config_options(self):
del self.options.with_dx
if self.settings.os != "Macos":
del self.options.with_metal
if Version(self.version) >= "3.7.0":
self.license = "DocumentRef-LICENSE.txt:LicenseRef-Tomorrow-Open-Source-Technology"

def configure(self):
if self.options.shared:
Expand Down

This file was deleted.

15 changes: 0 additions & 15 deletions recipes/opensubdiv/all/patches/3.4.4-0002-cmake-no-rpath.patch

This file was deleted.

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")
8 changes: 0 additions & 8 deletions recipes/opensubdiv/all/test_v1_package/CMakeLists.txt

This file was deleted.

17 changes: 0 additions & 17 deletions recipes/opensubdiv/all/test_v1_package/conanfile.py

This file was deleted.

6 changes: 2 additions & 4 deletions recipes/opensubdiv/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
versions:
"3.6.0":
folder: all
"3.5.0":
"3.7.0":
folder: all
"3.4.4":
"3.6.0":
folder: all