1 |
commit: 6110fc259680b841e7c2a7d6a168b7666d6d90bf |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Jun 5 12:21:45 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jun 5 12:48:43 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6110fc25 |
7 |
|
8 |
media-libs/assimp: 5.0.1 version bump, switch to cmake.eclass, EAPI-7 |
9 |
|
10 |
- Add IUSE="doc" |
11 |
- Drop IUSE="tools" as Qt5 based viewer was removed upstream |
12 |
commit 13586eb0739146dc609fa83bcd71fee1bb66f4b7 |
13 |
- GNUInstallDirs++ |
14 |
patch from commit cbf94fd62ff831879d10f99aa7766d391ae8a9b7 |
15 |
|
16 |
Thanks-to: Victor Mataré <matare <AT> fh-aachen.de> |
17 |
Closes: https://bugs.gentoo.org/701912 |
18 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
19 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
20 |
|
21 |
media-libs/assimp/Manifest | 2 + |
22 |
media-libs/assimp/assimp-5.0.1.ebuild | 62 ++++++ |
23 |
.../assimp/files/assimp-5.0.1-GNUInstallDirs.patch | 239 +++++++++++++++++++++ |
24 |
3 files changed, 303 insertions(+) |
25 |
|
26 |
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest |
27 |
index 31741ac4ef0..90527fbe192 100644 |
28 |
--- a/media-libs/assimp/Manifest |
29 |
+++ b/media-libs/assimp/Manifest |
30 |
@@ -1,3 +1,5 @@ |
31 |
DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb |
32 |
DIST assimp-4.1.0.tar.gz 45417293 BLAKE2B 74170ab48b64ab357ddd9da58f1218d0c3c0a4039345dcd7ae396aca3bb47c2f5ea2ee8b61b7d81c68c2e1237cd3ba516b816038400e9960b6c0cfe031a41e54 SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a |
33 |
DIST assimp-5.0.0.tar.gz 46604597 BLAKE2B 850c84cce6c24c01c2db00d76337797f3e4a4e819e133cf194cac0a7344fa58cb4805e0d5eb29b434f651c0b977e2c0fc5dbe083557f19bb9fe7ccb6977428d1 SHA512 0f73b6e961cd8455d6b6c8c10ed8b99485d846c96377b5d4fcc3b83f737647207c1306aa3dd51dad9654fbfa61bfe1119b34646f90288ae7ecab45efa6fa418a |
34 |
+DIST assimp-5.0.1.tar.gz 46607553 BLAKE2B 7f8cdf2bc602398fbdb675094d135e955716deb8f6469a4b68f7a8c735ecaa3120ee023c5c1f95c5a79c0606ed9a3cb3491c5011e2b409da523b56cd193ebb60 SHA512 51b704ffea778638b9e228578650f62691c56ee1a90337f8bbbee37e807455466d818234be24852334e5806260e5690932c9bd8e00f055c5c26782e0636538f0 |
35 |
+DIST assimp-docs-5.0.1.pdf 315941 BLAKE2B 06b2d3a68b6f70fd2ca3daee6cbcd79da255ec8ba00383077b775a1e032ab9675b5f70f2c5e9c1a6f51a4c65b482dfd7bce6c8be3c0288d6f6a653feaa7dfd84 SHA512 f37b8eb8d3a3c6198a91f03fd712a911990aa2d5f50e5039d54349dd673e5270e11ff55aa430f7c3ccbb142cb3b9530684157c25d8a533861b6de34064ab339e |
36 |
|
37 |
diff --git a/media-libs/assimp/assimp-5.0.1.ebuild b/media-libs/assimp/assimp-5.0.1.ebuild |
38 |
new file mode 100644 |
39 |
index 00000000000..96281b1fd32 |
40 |
--- /dev/null |
41 |
+++ b/media-libs/assimp/assimp-5.0.1.ebuild |
42 |
@@ -0,0 +1,62 @@ |
43 |
+# Copyright 1999-2020 Gentoo Authors |
44 |
+# Distributed under the terms of the GNU General Public License v2 |
45 |
+ |
46 |
+EAPI=7 |
47 |
+ |
48 |
+inherit cmake |
49 |
+ |
50 |
+DESCRIPTION="Importer library to import assets from 3D files" |
51 |
+HOMEPAGE="https://github.com/assimp/assimp" |
52 |
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz |
53 |
+doc? ( https://github.com/${PN}/${PN}/releases/download/v${PV}/${PN}-docs-${PV}.pdf )" |
54 |
+ |
55 |
+LICENSE="BSD" |
56 |
+SLOT="0" |
57 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
58 |
+IUSE="doc samples test" |
59 |
+ |
60 |
+RESTRICT="!test? ( test )" |
61 |
+ |
62 |
+RDEPEND=" |
63 |
+ dev-libs/boost:= |
64 |
+ sys-libs/zlib[minizip] |
65 |
+ samples? ( |
66 |
+ media-libs/freeglut |
67 |
+ virtual/opengl |
68 |
+ x11-libs/libX11 |
69 |
+ ) |
70 |
+" |
71 |
+DEPEND="${RDEPEND} |
72 |
+ test? ( dev-cpp/gtest ) |
73 |
+" |
74 |
+ |
75 |
+PATCHES=( |
76 |
+ "${FILESDIR}/${PN}-5.0.0-disabletest.patch" # bug 659122 |
77 |
+ "${FILESDIR}/${PN}-5.0.0-unzip-of.patch" |
78 |
+ "${FILESDIR}/${PN}-5.0.0-findassimp.patch" |
79 |
+ "${FILESDIR}/${P}-GNUInstallDirs.patch" # bug 701912 |
80 |
+) |
81 |
+ |
82 |
+src_configure() { |
83 |
+ local mycmakeargs=( |
84 |
+ -DASSIMP_BUILD_STATIC_LIB=OFF |
85 |
+ -DCMAKE_DEBUG_POSTFIX="" |
86 |
+ -DASSIMP_BUILD_SAMPLES=$(usex samples) |
87 |
+ -DASSIMP_BUILD_TESTS=$(usex test) |
88 |
+ ) |
89 |
+ |
90 |
+ cmake_src_configure |
91 |
+} |
92 |
+ |
93 |
+src_install() { |
94 |
+ cmake_src_install |
95 |
+ |
96 |
+ use doc && dodoc "${DISTDIR}"/${PN}-docs-${PV}.pdf |
97 |
+ |
98 |
+ insinto /usr/share/cmake/Modules |
99 |
+ doins cmake-modules/Findassimp.cmake |
100 |
+} |
101 |
+ |
102 |
+src_test() { |
103 |
+ "${BUILD_DIR}/test/unit" || die |
104 |
+} |
105 |
|
106 |
diff --git a/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch b/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch |
107 |
new file mode 100644 |
108 |
index 00000000000..134edc7d7da |
109 |
--- /dev/null |
110 |
+++ b/media-libs/assimp/files/assimp-5.0.1-GNUInstallDirs.patch |
111 |
@@ -0,0 +1,239 @@ |
112 |
+From cbf94fd62ff831879d10f99aa7766d391ae8a9b7 Mon Sep 17 00:00:00 2001 |
113 |
+From: =?UTF-8?q?Victor=20Matar=C3=A9?= <matare@×××××××××.de> |
114 |
+Date: Tue, 31 Mar 2020 21:30:07 +0200 |
115 |
+Subject: [PATCH] use GNUInstallDirs where possible |
116 |
+ |
117 |
+Emulate the CMAKE_INSTALL_FULL_* variables on non-Unix systems and |
118 |
+disable redefining FHS-mandated install locations via user-editable |
119 |
+ASSIMP_*_INSTALL_DIR variables. Instead, if it REALLY proves necessary, |
120 |
+Unix users can edit the advanced, canonical CMAKE_INSTALL_* variables. |
121 |
+--- |
122 |
+ CMakeLists.txt | 36 ++++++++++++++++++++++------------ |
123 |
+ assimp.pc.in | 6 ++---- |
124 |
+ assimpTargets-debug.cmake.in | 20 +++++++++---------- |
125 |
+ assimpTargets-release.cmake.in | 18 ++++++++--------- |
126 |
+ assimpTargets.cmake.in | 15 +------------- |
127 |
+ 5 files changed, 45 insertions(+), 50 deletions(-) |
128 |
+ |
129 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
130 |
+index dcafb649f5..c23c0df33e 100644 |
131 |
+--- a/CMakeLists.txt |
132 |
++++ b/CMakeLists.txt |
133 |
+@@ -230,11 +230,6 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M |
134 |
+ SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev) |
135 |
+ SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names") |
136 |
+ |
137 |
+-IF( UNIX ) |
138 |
+- # Use GNUInstallDirs for Unix predefined directories |
139 |
+- INCLUDE(GNUInstallDirs) |
140 |
+-ENDIF( UNIX ) |
141 |
+- |
142 |
+ # Grouped compiler settings |
143 |
+ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW) |
144 |
+ IF(NOT HUNTER_ENABLED) |
145 |
+@@ -329,14 +324,6 @@ IF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) |
146 |
+ SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin" ) |
147 |
+ ENDIF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) |
148 |
+ |
149 |
+-# Cache these to allow the user to override them manually. |
150 |
+-SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING |
151 |
+- "Path the built library files are installed to." ) |
152 |
+-SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING |
153 |
+- "Path the header files are installed to." ) |
154 |
+-SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING |
155 |
+- "Path the tool executables are installed to." ) |
156 |
+- |
157 |
+ get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG) |
158 |
+ |
159 |
+ IF (INJECT_DEBUG_POSTFIX AND (is_multi_config OR CMAKE_BUILD_TYPE STREQUAL "Debug")) |
160 |
+@@ -391,6 +378,29 @@ IF(HUNTER_ENABLED) |
161 |
+ ) |
162 |
+ ELSE(HUNTER_ENABLED) |
163 |
+ # cmake configuration files |
164 |
++ |
165 |
++ IF( UNIX ) |
166 |
++ # Use GNUInstallDirs for Unix predefined directories |
167 |
++ INCLUDE(GNUInstallDirs) |
168 |
++ |
169 |
++ SET( ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) |
170 |
++ SET( ASSIMP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}) |
171 |
++ SET( ASSIMP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}) |
172 |
++ ELSE( UNIX ) |
173 |
++ # Cache these to allow the user to override them on non-Unix platforms |
174 |
++ SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING |
175 |
++ "Path the built library files are installed to." ) |
176 |
++ SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING |
177 |
++ "Path the header files are installed to." ) |
178 |
++ SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING |
179 |
++ "Path the tool executables are installed to." ) |
180 |
++ |
181 |
++ SET(CMAKE_INSTALL_FULL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_INCLUDE_INSTALL_DIR}) |
182 |
++ SET(CMAKE_INSTALL_FULL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_LIB_INSTALL_DIR}) |
183 |
++ SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_BIN_INSTALL_DIR}) |
184 |
++ ENDIF( UNIX ) |
185 |
++ |
186 |
++ |
187 |
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE) |
188 |
+ CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE) |
189 |
+ IF (is_multi_config) |
190 |
+diff --git a/assimp.pc.in b/assimp.pc.in |
191 |
+index c659e19f2c..555a3a1d3b 100644 |
192 |
+--- a/assimp.pc.in |
193 |
++++ b/assimp.pc.in |
194 |
+@@ -1,7 +1,5 @@ |
195 |
+-prefix=@CMAKE_INSTALL_PREFIX@ |
196 |
+-exec_prefix=@CMAKE_INSTALL_PREFIX@/ |
197 |
+-libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@ |
198 |
+-includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@ |
199 |
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ |
200 |
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ |
201 |
+ |
202 |
+ Name: @CMAKE_PROJECT_NAME@ |
203 |
+ Description: Import various well-known 3D model formats in an uniform manner. |
204 |
+diff --git a/assimpTargets-debug.cmake.in b/assimpTargets-debug.cmake.in |
205 |
+index 1ebe2a6081..f5034c9349 100644 |
206 |
+--- a/assimpTargets-debug.cmake.in |
207 |
++++ b/assimpTargets-debug.cmake.in |
208 |
+@@ -42,22 +42,22 @@ if(MSVC) |
209 |
+ # Import target "assimp::assimp" for configuration "Debug" |
210 |
+ set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) |
211 |
+ set_target_properties(assimp::assimp PROPERTIES |
212 |
+- IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/${importLibraryName}" |
213 |
+- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" |
214 |
++ IMPORTED_IMPLIB_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}" |
215 |
++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" |
216 |
+ ) |
217 |
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) |
218 |
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}") |
219 |
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ) |
220 |
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}") |
221 |
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" ) |
222 |
+ else() |
223 |
+ set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@") |
224 |
+ |
225 |
+ # Import target "assimp::assimp" for configuration "Debug" |
226 |
+ set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG) |
227 |
+ set_target_properties(assimp::assimp PROPERTIES |
228 |
+- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}" |
229 |
++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" |
230 |
+ ) |
231 |
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) |
232 |
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}") |
233 |
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}") |
234 |
+ endif() |
235 |
+ |
236 |
+ else() |
237 |
+@@ -66,17 +66,17 @@ else() |
238 |
+ set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@") |
239 |
+ set_target_properties(assimp::assimp PROPERTIES |
240 |
+ IMPORTED_SONAME_DEBUG "${sharedLibraryName}" |
241 |
+- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" |
242 |
++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" |
243 |
+ ) |
244 |
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) |
245 |
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ) |
246 |
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" ) |
247 |
+ else() |
248 |
+ set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@") |
249 |
+ set_target_properties(assimp::assimp PROPERTIES |
250 |
+- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}" |
251 |
++ IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" |
252 |
+ ) |
253 |
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) |
254 |
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ) |
255 |
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" ) |
256 |
+ endif() |
257 |
+ endif() |
258 |
+ |
259 |
+diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in |
260 |
+index f3db8f12cd..a416e8899b 100644 |
261 |
+--- a/assimpTargets-release.cmake.in |
262 |
++++ b/assimpTargets-release.cmake.in |
263 |
+@@ -42,12 +42,12 @@ if(MSVC) |
264 |
+ # Import target "assimp::assimp" for configuration "Release" |
265 |
+ set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) |
266 |
+ set_target_properties(assimp::assimp PROPERTIES |
267 |
+- IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}" |
268 |
+- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" |
269 |
++ IMPORTED_IMPLIB_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}" |
270 |
++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" |
271 |
+ ) |
272 |
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) |
273 |
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}") |
274 |
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ) |
275 |
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}") |
276 |
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" ) |
277 |
+ else() |
278 |
+ set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@") |
279 |
+ |
280 |
+@@ -57,7 +57,7 @@ if(MSVC) |
281 |
+ IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}" |
282 |
+ ) |
283 |
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) |
284 |
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}") |
285 |
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}") |
286 |
+ endif() |
287 |
+ |
288 |
+ else() |
289 |
+@@ -70,17 +70,17 @@ else() |
290 |
+ endif() |
291 |
+ set_target_properties(assimp::assimp PROPERTIES |
292 |
+ IMPORTED_SONAME_RELEASE "${sharedLibraryName}" |
293 |
+- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" |
294 |
++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" |
295 |
+ ) |
296 |
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) |
297 |
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ) |
298 |
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${sharedLibraryName}" ) |
299 |
+ else() |
300 |
+ set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@") |
301 |
+ set_target_properties(assimp::assimp PROPERTIES |
302 |
+- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}" |
303 |
++ IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" |
304 |
+ ) |
305 |
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) |
306 |
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ) |
307 |
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" ) |
308 |
+ endif() |
309 |
+ endif() |
310 |
+ |
311 |
+diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in |
312 |
+index ab1a8d2c7b..ef90c834a6 100644 |
313 |
+--- a/assimpTargets.cmake.in |
314 |
++++ b/assimpTargets.cmake.in |
315 |
+@@ -40,16 +40,6 @@ unset(_targetsDefined) |
316 |
+ unset(_targetsNotDefined) |
317 |
+ unset(_expectedTargets) |
318 |
+ |
319 |
+- |
320 |
+-# Compute the installation prefix relative to this file. |
321 |
+-get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) |
322 |
+-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) |
323 |
+-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) |
324 |
+-get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) |
325 |
+-if(_IMPORT_PREFIX STREQUAL "/") |
326 |
+- set(_IMPORT_PREFIX "") |
327 |
+-endif() |
328 |
+- |
329 |
+ # Create imported target assimp::assimp |
330 |
+ if(@BUILD_SHARED_LIBS@) |
331 |
+ add_library(assimp::assimp SHARED IMPORTED) |
332 |
+@@ -60,7 +50,7 @@ endif() |
333 |
+ set_target_properties(assimp::assimp PROPERTIES |
334 |
+ COMPATIBLE_INTERFACE_STRING "assimp_MAJOR_VERSION" |
335 |
+ INTERFACE_assimp_MAJOR_VERSION "1" |
336 |
+- INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include" |
337 |
++ INTERFACE_INCLUDE_DIRECTORIES "@CMAKE_INSTALL_FULL_INCLUDEDIR@" |
338 |
+ #INTERFACE_LINK_LIBRARIES "TxtUtils::TxtUtils;MealyMachine::MealyMachine" |
339 |
+ ) |
340 |
+ |
341 |
+@@ -75,9 +65,6 @@ foreach(f ${CONFIG_FILES}) |
342 |
+ include(${f}) |
343 |
+ endforeach() |
344 |
+ |
345 |
+-# Cleanup temporary variables. |
346 |
+-set(_IMPORT_PREFIX) |
347 |
+- |
348 |
+ # Loop over all imported files and verify that they actually exist |
349 |
+ foreach(target ${_IMPORT_CHECK_TARGETS} ) |
350 |
+ foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} ) |