| From 58f576d6f240b08957a402960cdf06c74201ac7b Mon Sep 17 00:00:00 2001 |
| From: Hongxu Jia <hongxu.jia@windriver.com> |
| Date: Thu, 12 Dec 2019 22:16:15 -0800 |
| Subject: [PATCH] Use ASSIMP_LIB_INSTALL_DIR to search library |
| |
| Use ASSIMP_LIB_INSTALL_DIR rather than hardcoded /lib to search library |
| |
| Upstream-Status: Inappropriate [oe specific] |
| |
| Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| |
| --- |
| assimpTargets-release.cmake.in | 16 ++++++++-------- |
| 1 file changed, 8 insertions(+), 8 deletions(-) |
| |
| diff --git a/assimpTargets-release.cmake.in b/assimpTargets-release.cmake.in |
| index f3db8f1..b8a066a 100644 |
| --- a/assimpTargets-release.cmake.in |
| +++ b/assimpTargets-release.cmake.in |
| @@ -42,11 +42,11 @@ 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_IMPLIB_RELEASE "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${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}/@ASSIMP_LIB_INSTALL_DIR@/${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 +54,10 @@ 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_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}" |
| + IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${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}/@ASSIMP_LIB_INSTALL_DIR@/${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 "${_IMPORT_PREFIX}/@ASSIMP_LIB_INSTALL_DIR@/${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}/@ASSIMP_LIB_INSTALL_DIR@/${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}/@ASSIMP_LIB_INSTALL_DIR@/${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}/@ASSIMP_LIB_INSTALL_DIR@/${staticLibraryName}" ) |
| endif() |
| endif() |
| |