Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | From 58f576d6f240b08957a402960cdf06c74201ac7b Mon Sep 17 00:00:00 2001 |
| 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Thu, 12 Dec 2019 22:16:15 -0800 |
| 4 | Subject: [PATCH] Use ASSIMP_LIB_INSTALL_DIR to search library |
| 5 | |
| 6 | Use ASSIMP_LIB_INSTALL_DIR rather than hardcoded /lib to search library |
| 7 | |
| 8 | Upstream-Status: Inappropriate [oe specific] |
| 9 | |
| 10 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 11 | |
| 12 | --- |
| 13 | assimpTargets-release.cmake.in | 16 ++++++++-------- |
| 14 | 1 file changed, 8 insertions(+), 8 deletions(-) |
| 15 | |
| 16 | diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in |
| 17 | index f3db8f1..b8a066a 100644 |
| 18 | --- a/assimpTargets-release.cmake.in |
| 19 | +++ b/assimpTargets-release.cmake.in |
| 20 | @@ -42,11 +42,11 @@ if(MSVC) |
| 21 | # Import target "assimp::assimp" for configuration "Release" |
| 22 | set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) |
| 23 | set_target_properties(assimp::assimp PROPERTIES |
| 24 | - IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/lib/${importLibraryName}" |
| 25 | + IMPORTED_IMPLIB_RELEASE "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${importLibraryName}" |
| 26 | IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" |
| 27 | ) |
| 28 | list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) |
| 29 | - list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${importLibraryName}") |
| 30 | + list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${importLibraryName}") |
| 31 | list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/bin/${sharedLibraryName}" ) |
| 32 | else() |
| 33 | set(staticLibraryName "assimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@") |
| 34 | @@ -54,10 +54,10 @@ if(MSVC) |
| 35 | # Import target "assimp::assimp" for configuration "Release" |
| 36 | set_property(TARGET assimp::assimp APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE) |
| 37 | set_target_properties(assimp::assimp PROPERTIES |
| 38 | - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}" |
| 39 | + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${staticLibraryName}" |
| 40 | ) |
| 41 | list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) |
| 42 | - list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}") |
| 43 | + list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${staticLibraryName}") |
| 44 | endif() |
| 45 | |
| 46 | else() |
| 47 | @@ -70,17 +70,17 @@ else() |
| 48 | endif() |
| 49 | set_target_properties(assimp::assimp PROPERTIES |
| 50 | IMPORTED_SONAME_RELEASE "${sharedLibraryName}" |
| 51 | - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" |
| 52 | + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${sharedLibraryName}" |
| 53 | ) |
| 54 | list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) |
| 55 | - list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" ) |
| 56 | + list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${sharedLibraryName}" ) |
| 57 | else() |
| 58 | set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@") |
| 59 | set_target_properties(assimp::assimp PROPERTIES |
| 60 | - IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}" |
| 61 | + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${staticLibraryName}" |
| 62 | ) |
| 63 | list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp ) |
| 64 | - list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" ) |
| 65 | + list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${staticLibraryName}" ) |
| 66 | endif() |
| 67 | endif() |
| 68 | |