diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2020-01-22 13:46:35 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-04 15:56:29 +0000 |
commit | 4a762d532c17c8e33f95d1563d8295e73604f3b5 (patch) | |
tree | 086cccf0cea0026fa4c27d81de49cbbe8b39c29c /meta/recipes-graphics/vulkan/assimp | |
parent | 16094313e672dd2f7a29728ca3dd0bdfc4e2aa0d (diff) | |
download | poky-4a762d532c17c8e33f95d1563d8295e73604f3b5.tar.gz |
assimp: upgrade 5.0.0 -> 5.0.1
(From OE-Core rev: ea43f8af4652d78546fee874606cf4093b11098e)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/vulkan/assimp')
-rw-r--r-- | meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch b/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch index 3e9fbec701..34c5bfa857 100644 --- a/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch +++ b/meta/recipes-graphics/vulkan/assimp/0001-Use-ASSIMP_LIB_INSTALL_DIR-to-search-library.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From dd5c10f660716a2fab513714245be1932003306b Mon Sep 17 00:00:00 2001 | 1 | From 58f576d6f240b08957a402960cdf06c74201ac7b Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Thu, 12 Dec 2019 22:16:15 -0800 | 3 | Date: Thu, 12 Dec 2019 22:16:15 -0800 |
4 | Subject: [PATCH] Use ASSIMP_LIB_INSTALL_DIR to search library | 4 | Subject: [PATCH] Use ASSIMP_LIB_INSTALL_DIR to search library |
@@ -8,12 +8,13 @@ Use ASSIMP_LIB_INSTALL_DIR rather than hardcoded /lib to search library | |||
8 | Upstream-Status: Inappropriate [oe specific] | 8 | Upstream-Status: Inappropriate [oe specific] |
9 | 9 | ||
10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
11 | |||
11 | --- | 12 | --- |
12 | assimpTargets-release.cmake.in | 16 ++++++++-------- | 13 | assimpTargets-release.cmake.in | 16 ++++++++-------- |
13 | 1 file changed, 8 insertions(+), 8 deletions(-) | 14 | 1 file changed, 8 insertions(+), 8 deletions(-) |
14 | 15 | ||
15 | diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in | 16 | diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in |
16 | index b09b881f..5c6999fe 100644 | 17 | index f3db8f1..b8a066a 100644 |
17 | --- a/assimpTargets-release.cmake.in | 18 | --- a/assimpTargets-release.cmake.in |
18 | +++ b/assimpTargets-release.cmake.in | 19 | +++ b/assimpTargets-release.cmake.in |
19 | @@ -42,11 +42,11 @@ if(MSVC) | 20 | @@ -42,11 +42,11 @@ if(MSVC) |
@@ -43,8 +44,8 @@ index b09b881f..5c6999fe 100644 | |||
43 | endif() | 44 | endif() |
44 | 45 | ||
45 | else() | 46 | else() |
46 | @@ -66,17 +66,17 @@ else() | 47 | @@ -70,17 +70,17 @@ else() |
47 | set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@") | 48 | endif() |
48 | set_target_properties(assimp::assimp PROPERTIES | 49 | set_target_properties(assimp::assimp PROPERTIES |
49 | IMPORTED_SONAME_RELEASE "${sharedLibraryName}" | 50 | IMPORTED_SONAME_RELEASE "${sharedLibraryName}" |
50 | - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" | 51 | - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" |
@@ -65,6 +66,3 @@ index b09b881f..5c6999fe 100644 | |||
65 | endif() | 66 | endif() |
66 | endif() | 67 | endif() |
67 | 68 | ||
68 | -- | ||
69 | 2.21.0 | ||
70 | |||