Merge branch 'master' into xin-issue_5211
commit
60b6d80936
|
@ -1418,9 +1418,8 @@ if(MSVC AND ASSIMP_INSTALL_PDB)
|
|||
COMPILE_PDB_NAME assimp${LIBRARY_SUFFIX}
|
||||
COMPILE_PDB_NAME_DEBUG assimp${LIBRARY_SUFFIX}${CMAKE_DEBUG_POSTFIX}
|
||||
)
|
||||
ENDIF()
|
||||
|
||||
IF(CMAKE_GENERATOR MATCHES "^Visual Studio")
|
||||
IF(GENERATOR_IS_MULTI_CONFIG)
|
||||
install(FILES ${Assimp_BINARY_DIR}/code/Debug/assimp${LIBRARY_SUFFIX}${CMAKE_DEBUG_POSTFIX}.pdb
|
||||
DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
|
||||
CONFIGURATIONS Debug
|
||||
|
@ -1439,6 +1438,11 @@ if(MSVC AND ASSIMP_INSTALL_PDB)
|
|||
CONFIGURATIONS RelWithDebInfo
|
||||
)
|
||||
ENDIF()
|
||||
ELSE()
|
||||
install(FILES $<TARGET_PDB_FILE:assimp>
|
||||
DESTINATION ${ASSIMP_LIB_INSTALL_DIR}
|
||||
)
|
||||
ENDIF()
|
||||
ENDIF ()
|
||||
|
||||
if (ASSIMP_COVERALLS)
|
||||
|
|
Loading…
Reference in New Issue