From c867e68ca880feb5fd01f65c39657b64084b2c2a Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 10 Jun 2021 00:17:07 +0200 Subject: [szip, hdf5] Fix mingw import lib names, control linkage (#17941) * Format manifest, make port version explicit * Use standard mingw import lib names * Choose either static or shared binaries * Insert macro for dynamic linkage * Add szip pc file * Quote path expressions * Port away from deprecated cmake functions * x-add-version * Begin of hdf5 changes * Remove obsolete variables (complements 23eadeae) * Fix indentation and quoting expressions * Handle single-linkage szip configuration * Use mingw import lib names for hdf5 * Move dependencies to Requires in pc file * Port away from deprecated cmake functions * x-add-version hdf5 * Apply szip review comments * Update version * Improve pkgconfig patch to handle lists * Update git-tree --- triplets/community/arm-mingw-dynamic.cmake | 3 --- triplets/community/arm64-mingw-dynamic.cmake | 3 --- triplets/community/x64-mingw-dynamic.cmake | 3 --- triplets/community/x86-mingw-dynamic.cmake | 3 --- 4 files changed, 12 deletions(-) (limited to 'triplets') diff --git a/triplets/community/arm-mingw-dynamic.cmake b/triplets/community/arm-mingw-dynamic.cmake index f38a7cfc0..b23870c11 100644 --- a/triplets/community/arm-mingw-dynamic.cmake +++ b/triplets/community/arm-mingw-dynamic.cmake @@ -5,6 +5,3 @@ set(VCPKG_ENV_PASSTHROUGH PATH) set(VCPKG_CMAKE_SYSTEM_NAME MinGW) set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -if(PORT STREQUAL "szip") - set(VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK enabled) -endif() diff --git a/triplets/community/arm64-mingw-dynamic.cmake b/triplets/community/arm64-mingw-dynamic.cmake index a90b4f241..30ed204ed 100644 --- a/triplets/community/arm64-mingw-dynamic.cmake +++ b/triplets/community/arm64-mingw-dynamic.cmake @@ -5,6 +5,3 @@ set(VCPKG_ENV_PASSTHROUGH PATH) set(VCPKG_CMAKE_SYSTEM_NAME MinGW) set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -if(PORT STREQUAL "szip") - set(VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK enabled) -endif() diff --git a/triplets/community/x64-mingw-dynamic.cmake b/triplets/community/x64-mingw-dynamic.cmake index ff4845c33..1f132cfe1 100644 --- a/triplets/community/x64-mingw-dynamic.cmake +++ b/triplets/community/x64-mingw-dynamic.cmake @@ -5,6 +5,3 @@ set(VCPKG_ENV_PASSTHROUGH PATH) set(VCPKG_CMAKE_SYSTEM_NAME MinGW) set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -if(PORT STREQUAL "szip") - set(VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK enabled) -endif() diff --git a/triplets/community/x86-mingw-dynamic.cmake b/triplets/community/x86-mingw-dynamic.cmake index b27397187..000b36d96 100644 --- a/triplets/community/x86-mingw-dynamic.cmake +++ b/triplets/community/x86-mingw-dynamic.cmake @@ -5,6 +5,3 @@ set(VCPKG_ENV_PASSTHROUGH PATH) set(VCPKG_CMAKE_SYSTEM_NAME MinGW) set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled) -if(PORT STREQUAL "szip") - set(VCPKG_POLICY_SKIP_ARCHITECTURE_CHECK enabled) -endif() -- cgit v1.2.3