Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 701912
Collapse All | Expand All

(-)a/assimpTargets-debug.cmake.in (-4 / +12 lines)
Lines 7-12 set(CMAKE_IMPORT_FILE_VERSION 1) Link Here
7
7
8
set(ASSIMP_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
8
set(ASSIMP_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
9
9
10
get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
11
12
if ("${LIB64}" STREQUAL "TRUE")
13
    set(LIBSUFFIX 64)
14
else()
15
    set(LIBSUFFIX "")
16
endif()
17
10
if(MSVC)
18
if(MSVC)
11
  if(MSVC_TOOLSET_VERSION)
19
  if(MSVC_TOOLSET_VERSION)
12
    set(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}")
20
    set(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}")
Lines 66-82 else() Link Here
66
    set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")
74
    set(sharedLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@.@ASSIMP_VERSION_MAJOR@")
67
    set_target_properties(assimp::assimp PROPERTIES
75
    set_target_properties(assimp::assimp PROPERTIES
68
      IMPORTED_SONAME_DEBUG "${sharedLibraryName}"
76
      IMPORTED_SONAME_DEBUG "${sharedLibraryName}"
69
      IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
77
      IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${sharedLibraryName}"
70
    )
78
    )
71
    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
79
    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
72
    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
80
    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${sharedLibraryName}" )
73
  else()
81
  else()
74
    set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
82
    set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_DEBUG_POSTFIX@@CMAKE_STATIC_LIBRARY_SUFFIX@")
75
    set_target_properties(assimp::assimp PROPERTIES
83
    set_target_properties(assimp::assimp PROPERTIES
76
      IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
84
      IMPORTED_LOCATION_DEBUG "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}"
77
    )
85
    )
78
    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
86
    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
79
    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
87
    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}" )
80
  endif()
88
  endif()
81
endif()
89
endif()
82
90
(-)a/assimpTargets-release.cmake.in (-4 / +12 lines)
Lines 7-12 set(CMAKE_IMPORT_FILE_VERSION 1) Link Here
7
7
8
set(ASSIMP_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
8
set(ASSIMP_BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
9
9
10
get_property(LIB64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
11
12
if ("${LIB64}" STREQUAL "TRUE")
13
    set(LIBSUFFIX 64)
14
else()
15
    set(LIBSUFFIX "")
16
endif()
17
10
if(MSVC)
18
if(MSVC)
11
  if(MSVC_TOOLSET_VERSION)
19
  if(MSVC_TOOLSET_VERSION)
12
    set(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}")
20
    set(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}")
Lines 70-86 else() Link Here
70
    endif()
78
    endif()
71
    set_target_properties(assimp::assimp PROPERTIES
79
    set_target_properties(assimp::assimp PROPERTIES
72
      IMPORTED_SONAME_RELEASE "${sharedLibraryName}"
80
      IMPORTED_SONAME_RELEASE "${sharedLibraryName}"
73
      IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${sharedLibraryName}"
81
      IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${sharedLibraryName}"
74
    )
82
    )
75
    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
83
    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
76
    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${sharedLibraryName}" )
84
    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${sharedLibraryName}" )
77
  else()
85
  else()
78
    set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
86
    set(staticLibraryName "libassimp${ASSIMP_LIBRARY_SUFFIX}@CMAKE_STATIC_LIBRARY_SUFFIX@")
79
    set_target_properties(assimp::assimp PROPERTIES
87
    set_target_properties(assimp::assimp PROPERTIES
80
      IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/${staticLibraryName}"
88
      IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}"
81
    )
89
    )
82
    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
90
    list(APPEND _IMPORT_CHECK_TARGETS assimp::assimp )
83
    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib/${staticLibraryName}" )
91
    list(APPEND _IMPORT_CHECK_FILES_FOR_assimp::assimp "${_IMPORT_PREFIX}/lib${LIBSUFFIX}/${staticLibraryName}" )
84
  endif()
92
  endif()
85
endif()
93
endif()
86
94

Return to bug 701912