Notification time stamped 2021-08-01 01:56:15 UTC
From 7d2214ecba277e156b202abf797fbf36c9ec718e Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans(a)cottsay.net>
Date: Mar 23 2021 19:55:42 +0000
Subject: Add an upstream patch to fix imported library locations
---
diff --git a/assimp-5.0.1-lib-dir.patch b/assimp-5.0.1-lib-dir.patch
new file mode 100644
index 0000000..d05c0d7
--- /dev/null
+++ b/assimp-5.0.1-lib-dir.patch
@@ -0,0 +1,134 @@
+diff -uNr a/assimpTargets-debug.cmake.in b/assimpTargets-debug.cmake.in
+--- a/assimpTargets-debug.cmake.in 2020-01-12 03:56:40.000000000 -0800
++++ b/assimpTargets-debug.cmake.in 2021-03-23 12:45:13.392725131 -0700
+@@ -7,6 +7,14 @@
+
+ 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}")
+@@ -42,11 +50,11 @@
+ # Import target "assimp::assimp" for configuration "Debug"
+ set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+ set_target_properties(assimp::assimp PROPERTIES
+- IMPORTED_IMPLIB_DEBUG "${_IMPORT_PREFIX}/lib/${importLibraryName}"
++ IMPORTED_IMPLIB_DEBUG
"${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${importLibraryName}"
+ IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
+ )
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp
"${_IMPORT_PREFIX}/lib/${importLibraryName}")
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp
"${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${importLibraryName}")
+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp
"${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
+ else()
+ set(staticLibraryName
"assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
+@@ -54,10 +62,10 @@
+ # Import target "assimp::assimp" for configuration "Debug"
+ set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS DEBUG)
+ 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()
+
+ else()
+@@ -66,17 +74,17 @@
+ set(sharedLibraryName
"libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR(a)")
+ 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 -uNr a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in
+--- a/assimpTargets-release.cmake.in 2020-01-12 03:56:40.000000000 -0800
++++ b/assimpTargets-release.cmake.in 2021-03-23 12:45:40.323586653 -0700
+@@ -7,6 +7,14 @@
+
+ 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}")
+@@ -42,11 +50,11 @@
+ # Import target "assimp::assimp" for configuration "Release"
+ set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+ set_target_properties(assimp::assimp PROPERTIES
+- IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}"
++ IMPORTED_IMPLIB_RELEASE
"${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${importLibraryName}"
+ IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}"
+ )
+ list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
+- list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp
"${_IMPORT_PREFIX}/lib/${importLibraryName}")
++ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp
"${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${importLibraryName}")
+ list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp
"${_IMPORT_PREFIX}/bin/${sharedLibraryName}" )
+ else()
+ set(staticLibraryName
"assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
+@@ -54,10 +62,10 @@
+ # Import target "assimp::assimp" for configuration "Release"
+ set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
+ 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()
+
+ else()
+@@ -70,17 +78,17 @@
+ 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()
+
diff --git a/assimp.spec b/assimp.spec
index a7fa51c..a0f64d5 100644
--- a/assimp.spec
+++ b/assimp.spec
@@ -1,7 +1,7 @@
%undefine __cmake_in_source_build
Name: assimp
Version: 5.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Library to import various 3D model formats into applications
# Assimp is BSD
@@ -32,6 +32,8 @@ Patch3: %{name}-5.0.1-doxyfile.patch
Patch4: %{name}-5.0.1-irrxml.patch
# Correct the CMake version to match the tarball version.
Patch5: %{name}-5.0.1-assimpversion.patch
+# Correct the library installation location
+Patch6: %{name}-5.0.1-lib-dir.patch
BuildRequires: boost-devel
BuildRequires: cmake
@@ -115,6 +117,7 @@ rm -r contrib/utf8cpp
%patch3 -p1 -b .doxyfile
%patch4 -p1 -b .irrxml
%patch5 -p1 -b .assimpversion
+%patch6 -p1 -b .libdir
%build
%cmake \
@@ -174,6 +177,9 @@ rm -f %{buildroot}%{_libdir}/libzlibstatic.a
%endif
%changelog
+* Tue Mar 23 2021 Scott K Logan <logans(a)cottsay.net> - 5.0.1-2
+- Add an upstream patch to fix imported library locations
+
* Sat Feb 27 2021 Rich Mattes <richmattes(a)gmail.com> - 5.0.1-1
- Update to release 5.0.1
https://src.fedoraproject.org/rpms/assimp/c/7d2214ecba277e156b202abf797fb...