[kealib] Update to 1.5.3 (#35819)

This commit is contained in:
Kai Pastor 2023-12-22 21:47:59 +01:00 committed by GitHub
parent f30434939d
commit e9435ccc15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 52 deletions

View File

@ -1,43 +0,0 @@
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a9b19fe..3ab09c1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,21 +54,8 @@ set_target_properties(${LIBKEA_LIB_NAME}
)
add_library(Kealib INTERFACE)
-target_include_directories(Kealib INTERFACE
- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
- $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
- $<INSTALL_INTERFACE:include>
-)
-# TODO: a better way??
-if(MSVC)
- target_link_libraries(Kealib INTERFACE
- $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/libkea${CMAKE_IMPORT_LIBRARY_SUFFIX}>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/lib/libkea${CMAKE_IMPORT_LIBRARY_SUFFIX}>)
-else()
- target_link_libraries(Kealib INTERFACE
- $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/libkea${CMAKE_SHARED_LIBRARY_SUFFIX}>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/lib/libkea${CMAKE_SHARED_LIBRARY_SUFFIX}>)
-endif(MSVC)
+target_include_directories(Kealib INTERFACE $<INSTALL_INTERFACE:include>)
+target_link_libraries(Kealib INTERFACE ${LIBKEA_LIB_NAME})
###############################################################################
###############################################################################
diff --git a/src/Config.cmake.in b/src/Config.cmake.in
index 7de44f9..8a7bb8c 100644
--- a/src/Config.cmake.in
+++ b/src/Config.cmake.in
@@ -1,5 +1,10 @@
@PACKAGE_INIT@
+# FindHDF5.cmake may expose exported targets in HDF5_LIBRARIES.
+include(CMakeFindDependencyMacro)
+set(HDF5_USE_STATIC_LIBRARIES "@HDF5_USE_STATIC_LIBRARIES@")
+find_dependency(HDF5)
+
include("${CMAKE_CURRENT_LIST_DIR}/libkeaTargets.cmake")
check_required_components(libkea)

View File

@ -2,10 +2,9 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO ubarsc/kealib REPO ubarsc/kealib
REF "kealib-${VERSION}" REF "kealib-${VERSION}"
SHA512 82399f1332ff2aeb6342732e9e5c897c813109fd18e77cfc8d866f06adf4faa7f080f1f3c0a3b777fb3a679912dacf4851b7ad09a338d6087dd1d26eb2d1689f SHA512 ccaaf9d5031eac32bf1a0e6b9e9efb4f5245fc730d33bd9931efb1a6f529990c6da8ddd400ec0d58ee527675057b74c81393d263c9b182ac5f9a8796273b001f
HEAD_REF master HEAD_REF master
PATCHES PATCHES
kealib-target.diff
no-kea-config-script.diff no-kea-config-script.diff
) )
@ -18,7 +17,8 @@ vcpkg_cmake_configure(
vcpkg_cmake_install() vcpkg_cmake_install()
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libkea PACKAGE_NAME libkea) vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libkea PACKAGE_NAME libkea DO_NOT_DELETE_PARENT_CONFIG_PATH)
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Kealib)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

View File

@ -1,4 +1,4 @@
kealib provides CMake targets: kealib provides CMake targets:
find_package(libkea CONFIG REQUIRED) find_package(Kealib CONFIG REQUIRED)
target_link_libraries(main PRIVATE libkea::Kealib) target_link_libraries(main PRIVATE Kealib::Kealib)

View File

@ -1,9 +1,9 @@
{ {
"name": "kealib", "name": "kealib",
"version": "1.5.2", "version": "1.5.3",
"port-version": 1,
"description": "KEALib provides an implementation of the GDAL data model using HDF5.", "description": "KEALib provides an implementation of the GDAL data model using HDF5.",
"homepage": "https://github.com/ubarsc/kealib", "homepage": "https://github.com/ubarsc/kealib",
"license": "MIT",
"dependencies": [ "dependencies": [
{ {
"name": "hdf5", "name": "hdf5",

View File

@ -3745,8 +3745,8 @@
"port-version": 0 "port-version": 0
}, },
"kealib": { "kealib": {
"baseline": "1.5.2", "baseline": "1.5.3",
"port-version": 1 "port-version": 0
}, },
"keccak-tiny": { "keccak-tiny": {
"baseline": "2014-09-08", "baseline": "2014-09-08",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "56a7c2f40ce5bb8f1674cf676d80c20a32e32d14",
"version": "1.5.3",
"port-version": 0
},
{ {
"git-tree": "a32984c499e3b89d71c221916c41d59cf8cb1834", "git-tree": "a32984c499e3b89d71c221916c41d59cf8cb1834",
"version": "1.5.2", "version": "1.5.2",