From 9ef5166b09b4d8b492401b464b4c72ddfdfff48f645c8d65cd8b908984a36f9e Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Wed, 10 Jun 2020 22:17:54 +0000 Subject: [PATCH] Accepting request 813181 from home:cgiboudeaux:branches:games - Add upstream patch to fix the broken CMake config files: * 0001-use-GNUInstallDirs-where-possible.patch (adapted for the 5.0.1 release) OBS-URL: https://build.opensuse.org/request/show/813181 OBS-URL: https://build.opensuse.org/package/show/games/assimp?expand=0&rev=13 --- 0001-use-GNUInstallDirs-where-possible.patch | 242 +++++++++++++++++++ assimp.changes | 7 + assimp.spec | 11 +- 3 files changed, 255 insertions(+), 5 deletions(-) create mode 100644 0001-use-GNUInstallDirs-where-possible.patch diff --git a/0001-use-GNUInstallDirs-where-possible.patch b/0001-use-GNUInstallDirs-where-possible.patch new file mode 100644 index 0000000..ed901c1 --- /dev/null +++ b/0001-use-GNUInstallDirs-where-possible.patch @@ -0,0 +1,242 @@ +From b483fbb30ce41786e9a308f1e2fbd41ecd410feb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Victor=20Matar=C3=A9?= +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 + diff --git a/assimp.changes b/assimp.changes index 9a322e7..4e66d29 100644 --- a/assimp.changes +++ b/assimp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Jun 10 09:38:02 UTC 2020 - Christophe Giboudeaux + +- 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 diff --git a/assimp.spec b/assimp.spec index cfa2108..983b156 100644 --- a/assimp.spec +++ b/assimp.spec @@ -26,6 +26,8 @@ Group: Development/Libraries/C and C++ URL: https://assimp.org/ Source0: https://github.com/assimp/assimp/archive/v%{version}/assimp-%{version}.tar.gz 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++ @@ -72,13 +74,12 @@ it is primarily useful for importing assets from various sources once and storin engine-specific format for easy and fast every-day-loading. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build -%cmake \ - -DASSIMP_LIB_INSTALL_DIR="%{_libdir}" -%make_build +%cmake + +%cmake_build %install %cmake_install