Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 615958 Details for
Bug 701912
media-libs/assimp-5.0.0 - assimpTargets-release.cmake references /usr/lib
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
check if we are building against x86_64
0001-RFC-cmake-targets-check-lib-or-lib64-path.patch (text/plain), 3.57 KB, created by
Nikita Shubin
on 2020-02-26 14:57:16 UTC
(
hide
)
Description:
check if we are building against x86_64
Filename:
MIME Type:
Creator:
Nikita Shubin
Created:
2020-02-26 14:57:16 UTC
Size:
3.57 KB
patch
obsolete
>diff --git a/assimpTargets-debug.cmake.in b/assimpTargets-debug.cmake.in >index 1ebe2a60..e53101cc 100644 >--- a/assimpTargets-debug.cmake.in >+++ b/assimpTargets-debug.cmake.in >@@ -7,6 +7,14 @@ set(CMAKE_IMPORT_FILE_VERSION 1) > > set(ASSIMP_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@) > >+get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) >+ >+if ("${LIB64}" STREQUAL "TRUE") >+ set(LIBSUFFIX 64) >+else() >+ set(LIBSUFFIX "") >+endif() >+ > if(MSVC) > if(MSVC_TOOLSET_VERSION) > set(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}") >@@ -66,17 +74,17 @@ else() > set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@") > set_target_properties(assimp::assimp PROPERTIES > IMPORTED_SONAME_DEBUG "${sharedLibraryName}" >- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" >+ IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${sharedLibraryName}" > ) > list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) >- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ) >+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${sharedLibraryName}" ) > else() > set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@") > set_target_properties(assimp::assimp PROPERTIES >- IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}" >+ IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}" > ) > list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) >- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ) >+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}" ) > endif() > endif() > >diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in >index f3db8f12..0bc02292 100644 >--- a/assimpTargets-release.cmake.in >+++ b/assimpTargets-release.cmake.in >@@ -7,6 +7,14 @@ set(CMAKE_IMPORT_FILE_VERSION 1) > > set(ASSIMP_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@) > >+get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) >+ >+if ("${LIB64}" STREQUAL "TRUE") >+ set(LIBSUFFIX 64) >+else() >+ set(LIBSUFFIX "") >+endif() >+ > if(MSVC) > if(MSVC_TOOLSET_VERSION) > set(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}") >@@ -70,17 +78,17 @@ else() > endif() > set_target_properties(assimp::assimp PROPERTIES > IMPORTED_SONAME_RELEASE "${sharedLibraryName}" >- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" >+ IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${sharedLibraryName}" > ) > list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) >- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ) >+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${sharedLibraryName}" ) > else() > set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@") > set_target_properties(assimp::assimp PROPERTIES >- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}" >+ IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}" > ) > list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) >- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ) >+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}" ) > endif() > endif() >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 701912
: 615958