Hello community, here is the log from the commit of package assimp for openSUSE:Factory checked in at 2020-07-31 15:54:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/assimp (Old) and /work/SRC/openSUSE:Factory/.assimp.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "assimp" Fri Jul 31 15:54:53 2020 rev:2 rq:820816 version:5.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/assimp/assimp.changes 2017-06-08 14:57:53.994236800 +0200 +++ /work/SRC/openSUSE:Factory/.assimp.new.3592/assimp.changes 2020-07-31 15:57:22.728418573 +0200 @@ -1,0 +2,73 @@ +Thu Jul 9 20:42:17 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Restore the _service file. + +Assimp still ships files which are not allowed in openSUSE. + +------------------------------------------------------------------- +Wed Jun 10 09:38:02 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add upstream patch to fix the broken CMake config files: + * 0001-use-GNUInstallDirs-where-possible.patch + (adapted for the 5.0.1 release) + +------------------------------------------------------------------- +Wed May 20 13:15:44 UTC 2020 - Ferdinand Thiessen <[email protected]> + +- Update to 5.0.1 + * Added texture types: BASE_COLOR, NORMAL_CAMERA, EMISSION_COLOR, + METALNESS, DIFFUSE_ROUGHNESS + * Fixed various issues and memory leaks + * 3DS: Explicitly pass "UNNAMED" as 3DS root node name and fix + more thread-safety issue in 3DS loader. + * 3MF: Introduce first prototype for basematerial support + * AssJSon: Add json export. + * Various other file support improvements +- Dropped viewer subpackage, as it now requires DirectX +- Removed not needed disable-gitrevision-test.patch +- Rebased do-not-install-irrXML.patch +- Removed not needed install-viewer.patch +- Removed _service + +------------------------------------------------------------------- +Wed Jan 23 20:08:14 UTC 2019 - Jan Engelhardt <[email protected]> + +- sanitize_source.sh was removed in the 4.1.0 update; restore its + logic with a new _service file and recreate the tarball. + +------------------------------------------------------------------- +Thu Jan 17 15:03:13 UTC 2019 - Jan Engelhardt <[email protected]> + +- Fix incorrect summary for libassimp*. + +------------------------------------------------------------------- +Sat Aug 11 16:16:03 UTC 2018 - [email protected] + +- Update to 4.1.0 + * Added support for Export 3MF (experimental) + * Added supprt for Import / Export glTF 2 + * Prevent failing stringstream to crash the export process + * Fix invalid access to mesh array when the array is + empty in Blender, also fixed short overflow. + * Fixed memory leak in AMFImporter + * Fixed IOStream leak in UnrealLoader: + * Fixed out-of-bounds read in MaterialSystem unit test + * Added support for SIB models from Silo 2.5 +- Changes from 4.0.1 + * StreamReader: fix out-of-range exception +- Changes From 4.0.0 + * New QT-Widget based assimp-viewer + * Open3DGC codec supported by glFT-importer + * glTF: Read and write transparency values + * Support for X3D, AMF and Lugdunum3D + * MDLLoader: fix resource leak. + * Fix memory leak in Collada importer + * Fixed many FBX bugs +- Added %check section, run unit tests +- Added disable-gitrevision-test.patch to fix testsuite as we do + not build from git, git rev will test will fail. +- Added do-not-install-irrXML.patch to prevent cmake from + installing the irrXML (static) library. +- install-viewer.patch: Install viewer component + +------------------------------------------------------------------- Old: ---- assimp-3.3.1-suse.tar.gz sanitize_source.sh New: ---- 0001-use-GNUInstallDirs-where-possible.patch _service assimp-5.0.1.tar.xz do-not-install-irrXML.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ assimp.spec ++++++ --- /var/tmp/diff_new_pack.XlHePc/_old 2020-07-31 15:57:32.456423309 +0200 +++ /var/tmp/diff_new_pack.XlHePc/_new 2020-07-31 15:57:32.460423311 +0200 @@ -1,7 +1,7 @@ # # spec file for package assimp # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,38 +12,52 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define sover 3 +%define sover 5 Name: assimp -Version: 3.3.1 +Version: 5.0.1 Release: 0 Summary: Library to load and process 3D scenes from various data formats -License: BSD-3-Clause +License: BSD-3-Clause AND MIT Group: Development/Libraries/C and C++ -Url: http://assimp.org/ -#Source: https://github.com/assimp/assimp/archive/v%{version}/%{name}-%{version}.tar.gz -Source: %{name}-%{version}-suse.tar.gz -Source9: sanitize_source.sh -BuildRequires: boost-devel +URL: https://assimp.org/ +Source0: %{name}-%{version}.tar.xz +Patch0: do-not-install-irrXML.patch +# PATCH-FIX-UPSTREAM -- Don't hardcode the library and binary location +Patch1: 0001-use-GNUInstallDirs-where-possible.patch BuildRequires: cmake BuildRequires: dos2unix BuildRequires: gcc-c++ +BuildRequires: irrlicht-devel +BuildRequires: libboost_headers-devel BuildRequires: pkgconfig BuildRequires: zlib-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(IL) +BuildRequires: pkgconfig(Qt5OpenGL) +BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(minizip) %description -Assimp is a library to load and process geometric scenes from various data formats. It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, materials, bone animations and potential texture data. The library is not designed for speed, it is primarily useful for importing assets from various sources once and storing it in a engine-specific format for easy and fast every-day-loading. +Assimp is a library to load and process geometric scenes from various data formats. +It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, +materials, bone animations and potential texture data. The library is not designed for speed, +it is primarily useful for importing assets from various sources once and storing it in a +engine-specific format for easy and fast every-day-loading. %package -n lib%{name}%{sover} -Summary: Headers, docs and command-line utility for %{name} +Summary: Library to load and process 3D scenes from various data formats Group: System/Libraries %description -n lib%{name}%{sover} -Assimp is a library to load and process geometric scenes from various data formats. It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, materials, bone animations and potential texture data. The library is not designed for speed, it is primarily useful for importing assets from various sources once and storing it in a engine-specific format for easy and fast every-day-loading. +Assimp is a library to load and process geometric scenes from various data formats. +It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, +materials, bone animations and potential texture data. The library is not designed for speed, +it is primarily useful for importing assets from various sources once and storing it in a +engine-specific format for easy and fast every-day-loading. %package devel Summary: Headers, docs and command-line utility for %{name} @@ -53,40 +67,38 @@ Requires: libstdc++-devel %description devel -Assimp is a library to load and process geometric scenes from various data formats. It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, materials, bone animations and potential texture data. The library is not designed for speed, it is primarily useful for importing assets from various sources once and storing it in a engine-specific format for easy and fast every-day-loading. +Assimp is a library to load and process geometric scenes from various data formats. +It is tailored at typical game scenarios by supporting a node hierarchy, static or skinned meshes, +materials, bone animations and potential texture data. The library is not designed for speed, +it is primarily useful for importing assets from various sources once and storing it in a +engine-specific format for easy and fast every-day-loading. %prep -%setup -q - -dos2unix LICENSE CREDITS CHANGES README -find . -type f -name "*.lib" -delete +%autosetup -p1 %build -%cmake \ - -DCMAKE_BUILD_TYPE="Release" \ - -DASSIMP_LIB_INSTALL_DIR="%{_libdir}" -CFLAGS="%{optflags}" make %{?_smp_mflags} +%cmake + +%cmake_build %install -rm -rf examples/.deps %cmake_install find %{buildroot} -type f -name "*.la" -delete -print +%check +pushd build/test +LD_LIBRARY_PATH=%{buildroot}%{_libdir} ctest --output-on-failure --force-new-ctest-process +popd + %post -n lib%{name}%{sover} -p /sbin/ldconfig %postun -n lib%{name}%{sover} -p /sbin/ldconfig %files -n lib%{name}%{sover} -%defattr(-,root,root) -%if 0%{?suse_version} > 1320 -%license CREDITS LICENSE -%else -%doc CREDITS LICENSE -%endif -%{_libdir}/libassimp.so.3* +%license LICENSE +%{_libdir}/libassimp.so.%{sover}* %files devel -%defattr(-,root,root) -%doc README CHANGES +%doc README CHANGES CREDITS %{_includedir}/assimp/ %{_bindir}/assimp %{_libdir}/libassimp.so ++++++ 0001-use-GNUInstallDirs-where-possible.patch ++++++ >From b483fbb30ce41786e9a308f1e2fbd41ecd410feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Victor=20Matar=C3=A9?= <[email protected]> Date: Tue, 31 Mar 2020 21:30:07 +0200 Subject: [PATCH] use GNUInstallDirs where possible Emulate the CMAKE_INSTALL_FULL_* variables on non-Unix systems and disable redefining FHS-mandated install locations via user-editable ASSIMP_*_INSTALL_DIR variables. Instead, if it REALLY proves necessary, Unix users can edit the advanced, canonical CMAKE_INSTALL_* variables. --- CMakeLists.txt | 33 ++++++++++++++++++++------------- assimp.pc.in | 6 ++---- assimpTargets-debug.cmake.in | 20 ++++++++++---------- assimpTargets-release.cmake.in | 20 ++++++++++---------- assimpTargets.cmake.in | 15 +-------------- 5 files changed, 43 insertions(+), 51 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dcafb64..c6109e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -230,11 +230,6 @@ SET(LIBASSIMP-DEV_COMPONENT "libassimp${ASSIMP_VERSION_MAJOR}.${ASSIMP_VERSION_M SET(CPACK_COMPONENTS_ALL assimp-bin ${LIBASSIMP_COMPONENT} ${LIBASSIMP-DEV_COMPONENT} assimp-dev) SET(ASSIMP_LIBRARY_SUFFIX "" CACHE STRING "Suffix to append to library names") -IF( UNIX ) - # Use GNUInstallDirs for Unix predefined directories - INCLUDE(GNUInstallDirs) -ENDIF( UNIX ) - # Grouped compiler settings IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT CMAKE_COMPILER_IS_MINGW) IF(NOT HUNTER_ENABLED) @@ -329,14 +324,6 @@ IF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/bin" ) ENDIF ( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR ) -# Cache these to allow the user to override them manually. -SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING - "Path the built library files are installed to." ) -SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING - "Path the header files are installed to." ) -SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING - "Path the tool executables are installed to." ) - get_cmake_property(is_multi_config GENERATOR_IS_MULTI_CONFIG) IF (INJECT_DEBUG_POSTFIX AND (is_multi_config OR CMAKE_BUILD_TYPE STREQUAL "Debug")) @@ -390,6 +377,26 @@ IF(HUNTER_ENABLED) DESTINATION "${CONFIG_INSTALL_DIR}" ) ELSE(HUNTER_ENABLED) + IF( UNIX ) + # Use GNUInstallDirs for Unix predefined directories + INCLUDE(GNUInstallDirs) + + SET( ASSIMP_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}) + SET( ASSIMP_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR}) + SET( ASSIMP_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}) + ELSE() + # Cache these to allow the user to override them on non-Unix platforms + SET( ASSIMP_LIB_INSTALL_DIR "lib" CACHE STRING + "Path the built library files are installed to." ) + SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE STRING + "Path the header files are installed to." ) + SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE STRING + "Path the tool executables are installed to." ) + + SET(CMAKE_INSTALL_FULL_INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_INCLUDE_INSTALL_DIR}) + SET(CMAKE_INSTALL_FULL_LIBDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_LIB_INSTALL_DIR}) + SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_PREFIX}/${ASSIMP_BIN_INSTALL_DIR}) + ENDIF() # cmake configuration files CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimp-config.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimp-config.cmake" @ONLY IMMEDIATE) CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/assimpTargets.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/assimpTargets.cmake" @ONLY IMMEDIATE) diff --git a/assimp.pc.in b/assimp.pc.in index c659e19..555a3a1 100644 --- a/assimp.pc.in +++ b/assimp.pc.in @@ -1,7 +1,5 @@ -prefix=@CMAKE_INSTALL_PREFIX@ -exec_prefix=@CMAKE_INSTALL_PREFIX@/ -libdir=@CMAKE_INSTALL_PREFIX@/@ASSIMP_LIB_INSTALL_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/../include/@ASSIMP_INCLUDE_INSTALL_DIR@ +libdir=@CMAKE_INSTALL_FULL_LIBDIR@ +includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ Name: @CMAKE_PROJECT_NAME@ Description: Import various well-known 3D model formats in an uniform manner. diff --git a/assimpTargets-debug.cmake.in b/assimpTargets-debug.cmake.in index 1ebe2a6..f5034c9 100644 --- a/assimpTargets-debug.cmake.in +++ b/assimpTargets-debug.cmake.in @@ -42,22 +42,22 @@ if(MSVC) # 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_LOCATION_DEBUG "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" + IMPORTED_IMPLIB_DEBUG "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}" + IMPORTED_LOCATION_DEBUG "@CMAKE_INSTALL_FULL_BINDIR@/${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}/bin/${sharedLibraryName}" ) + list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}") + list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" ) else() set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@") # 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 "@CMAKE_INSTALL_FULL_LIBDIR@/${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 "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}") endif() else() @@ -66,17 +66,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 "@CMAKE_INSTALL_FULL_LIBDIR@/${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 "@CMAKE_INSTALL_FULL_LIBDIR@/${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 "@CMAKE_INSTALL_FULL_LIBDIR@/${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 "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" ) endif() endif() diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in index f3db8f1..89f1a14 100644 --- a/assimpTargets-release.cmake.in +++ b/assimpTargets-release.cmake.in @@ -42,22 +42,22 @@ if(MSVC) # 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_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" + IMPORTED_IMPLIB_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}" + IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_BINDIR@/${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}/bin/${sharedLibraryName}" ) + list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_LIBDIR@/${importLibraryName}") + list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "@CMAKE_INSTALL_FULL_BINDIR@/${sharedLibraryName}" ) else() set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@") # 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 "@CMAKE_INSTALL_FULL_LIBDIR@/${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 "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}") endif() else() @@ -70,17 +70,17 @@ else() endif() set_target_properties(assimp::assimp PROPERTIES IMPORTED_SONAME_RELEASE "${sharedLibraryName}" - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" + IMPORTED_LOCATION_RELEASE "@CMAKE_INSTALL_FULL_LIBDIR@/${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 "@CMAKE_INSTALL_FULL_LIBDIR@/${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 "@CMAKE_INSTALL_FULL_LIBDIR@/${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 "@CMAKE_INSTALL_FULL_LIBDIR@/${staticLibraryName}" ) endif() endif() diff --git a/assimpTargets.cmake.in b/assimpTargets.cmake.in index ab1a8d2..ef90c83 100644 --- a/assimpTargets.cmake.in +++ b/assimpTargets.cmake.in @@ -40,16 +40,6 @@ unset(_targetsDefined) unset(_targetsNotDefined) unset(_expectedTargets) - -# Compute the installation prefix relative to this file. -get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) -if(_IMPORT_PREFIX STREQUAL "/") - set(_IMPORT_PREFIX "") -endif() - # Create imported target assimp::assimp if(@BUILD_SHARED_LIBS@) add_library(assimp::assimp SHARED IMPORTED) @@ -60,7 +50,7 @@ endif() set_target_properties(assimp::assimp PROPERTIES COMPATIBLE_INTERFACE_STRING "assimp_MAJOR_VERSION" INTERFACE_assimp_MAJOR_VERSION "1" - INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include;${_IMPORT_PREFIX}/include" + INTERFACE_INCLUDE_DIRECTORIES "@CMAKE_INSTALL_FULL_INCLUDEDIR@" #INTERFACE_LINK_LIBRARIES "TxtUtils::TxtUtils;MealyMachine::MealyMachine" ) @@ -75,9 +65,6 @@ foreach(f ${CONFIG_FILES}) include(${f}) endforeach() -# Cleanup temporary variables. -set(_IMPORT_PREFIX) - # Loop over all imported files and verify that they actually exist foreach(target ${_IMPORT_CHECK_TARGETS} ) foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} ) -- 2.26.2 ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">git://github.com/assimp/assimp</param> <param name="revision">v5.0.1</param> <param name="versionformat">5.0.1</param> <!-- non-OSI media --> <param name="exclude">test/models-nonbsd</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service name="set_version" mode="disabled"/> </services> ++++++ do-not-install-irrXML.patch ++++++ diff -Nur assimp-5.0.1/contrib/irrXML/CMakeLists.txt new/contrib/irrXML/CMakeLists.txt --- assimp-5.0.1/contrib/irrXML/CMakeLists.txt 2020-01-12 12:56:40.000000000 +0100 +++ new/contrib/irrXML/CMakeLists.txt 2020-05-20 01:51:22.652107741 +0200 @@ -21,9 +21,9 @@ set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" ) set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" ) -install(TARGETS IrrXML - LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} - RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} - FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} - COMPONENT ${LIBASSIMP_COMPONENT}) +#install(TARGETS IrrXML +# LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +# ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +# RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} +# FRAMEWORK DESTINATION ${ASSIMP_LIB_INSTALL_DIR} +# COMPONENT ${LIBASSIMP_COMPONENT})
