diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-10-17 11:10:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-17 02:10:11 -0700 |
| commit | aa0ffba768684702f04d6c397838365c3b23a053 (patch) | |
| tree | 7275a5954f232cb61c6e19789bc9437eafadab03 /ports/assimp | |
| parent | 32c5722104fc28cd55d166a2c04e1d44906eec68 (diff) | |
| download | vcpkg-aa0ffba768684702f04d6c397838365c3b23a053.tar.gz vcpkg-aa0ffba768684702f04d6c397838365c3b23a053.zip | |
[qt5] Update to 5.15.1 (#13477)
* update everything. Let ci test if just updating is enough
* fix some minor version details.
* remove upstream patch
* add zstdd patch and do not remove zlib since it is required for bootstrapping
* add mqtt hash
* webengine hash
* add fixup pkgconfig to assimp
* add assimp to qt-3d (still requires zlib fix)
* setup pkg-config for qt
* fix psql detection in configure
* fix build details
* fix assimp library nameing
* -rpath option is not available for static builds
* move config log somewhere where CI can catch it.
* move logs only if they exists
* append bzip2 qt-3d
* break qt3d again to get logs
* retry qt3d
* remove qt-3d failure. everything ok now
* add assistent patch for qt5-tools not building qthelp
* remove unnecessary qt5-webengine patches
* Remove PSQL_TYPES
* [qt5-3d] remove irrxml as a assimp dep
* remove unnecessary patch
* fix qt-3d on windows
* fix qt5-3d linux
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Diffstat (limited to 'ports/assimp')
| -rw-r--r-- | ports/assimp/portfile.cmake | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/ports/assimp/portfile.cmake b/ports/assimp/portfile.cmake index 9683a95fb..8c3b9dba2 100644 --- a/ports/assimp/portfile.cmake +++ b/ports/assimp/portfile.cmake @@ -43,7 +43,33 @@ vcpkg_configure_cmake( ) vcpkg_install_cmake() + +if(VCPKG_TARGET_IS_WINDOWS) + set(VCVER vc140 vc141 vc142 ) + set(CRT mt md) + set(DBG_NAMES) + set(REL_NAMES) + foreach(_ver IN LISTS VCVER) + foreach(_crt IN LISTS CRT) + list(APPEND DBG_NAMES assimp-${_ver}-${_crt}d) + list(APPEND REL_NAMES assimp-${_ver}-${_crt}) + endforeach() + endforeach() +endif() + +find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH) +find_library(ASSIMP_DBG NAMES assimp assimpd ${DBG_NAMES} PATHS "${CURRENT_PACKAGES_DIR}/debug/lib" NO_DEFAULT_PATH) +if(ASSIMP_REL) + get_filename_component(ASSIMP_NAME_REL "${ASSIMP_REL}" NAME_WLE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/assimp.pc" "-lassimp" "-l${ASSIMP_NAME_REL}") +endif() +if(ASSIMP_DBG) + get_filename_component(ASSIMP_NAME_DBG "${ASSIMP_DBG}" NAME_WLE) + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/assimp.pc" "-lassimp" "-l${ASSIMP_NAME_DBG}") +endif() + vcpkg_fixup_cmake_targets() +vcpkg_fixup_pkgconfig() # Probably requires more fixing for static builds. See qt5-3d and the config changes below vcpkg_copy_pdbs() file(READ ${CURRENT_PACKAGES_DIR}/share/assimp/AssimpConfig.cmake ASSIMP_CONFIG) |