Skip to content

1 12 - Update pkgconfig settings with version - #218 #221

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Dec 22, 2020
Merged

1 12 - Update pkgconfig settings with version - #218 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f2bee7d
merge updates from develop
byrnHDF Nov 19, 2020
6ab5469
remove extension on command
byrnHDF Nov 19, 2020
6f38edb
Run autogen before chkmanifest
byrnHDF Nov 20, 2020
ba6f5e2
Merge branch 'hdf5_1_12' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Nov 20, 2020
31fb51c
Update release text files and whitespace cleanup
byrnHDF Nov 20, 2020
4de97e6
Update list
byrnHDF Nov 20, 2020
5c6e1e9
Merge branch 'hdf5_1_12' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Nov 23, 2020
4bda2aa
Merge branch 'hdf5_1_12' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Dec 10, 2020
dcb2c6e
Merge branch 'hdf5_1_12' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Dec 11, 2020
e37997b
OESS-98 Update plugin build option
byrnHDF Dec 14, 2020
cbf1ec2
OESS-98 fix tools test for plugins
byrnHDF Dec 15, 2020
0c87896
Merge branch 'hdf5_1_12' of https://github.com/HDFGroup/hdf5.git
byrnHDF Dec 15, 2020
1d09369
Fix conflict
byrnHDF Dec 15, 2020
d824f22
Merge branch 'hdf5_1_12' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Dec 16, 2020
e898add
OESS-98 fix hdf5 link target
byrnHDF Dec 16, 2020
3fd08b4
Merge branch 'hdf5_1_12' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Dec 17, 2020
1372b71
Merge branch 'hdf5_1_12' of https://github.com/HDFGroup/hdf5.git into…
byrnHDF Dec 22, 2020
450e7d8
Update pkgconfig settings with version - #218
byrnHDF Dec 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions c++/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ if (BUILD_SHARED_LIBS)
set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_CPP_LIB_CORENAME}")
endif ()

set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}")
set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}")
set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}")
set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}")

configure_file (
${HDF_RESOURCES_DIR}/libhdf5.pc.in
Expand Down
4 changes: 2 additions & 2 deletions fortran/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,8 +535,8 @@ if (BUILD_SHARED_LIBS)
set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_F90_LIB_CORENAME}")
endif ()

set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}")
set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}")
set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}")
set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}")

configure_file (
${HDF_RESOURCES_DIR}/libhdf5.pc.in
Expand Down
4 changes: 2 additions & 2 deletions hl/c++/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ if (BUILD_SHARED_LIBS)
set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_CPP_LIB_CORENAME}")
endif ()

set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME}")
set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME}")
set (_PKG_CONFIG_REQUIRES "${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}")
set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_HL_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}")

configure_file (
${HDF_RESOURCES_DIR}/libhdf5.pc.in
Expand Down
4 changes: 2 additions & 2 deletions hl/fortran/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,8 @@ if (BUILD_SHARED_LIBS)
set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_F90_LIB_CORENAME}")
endif ()

set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME}")
set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME}")
set (_PKG_CONFIG_REQUIRES "${HDF5_F90_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}")
set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_F90_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}")

configure_file (
${HDF_RESOURCES_DIR}/libhdf5.pc.in
Expand Down
4 changes: 2 additions & 2 deletions hl/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ if (BUILD_SHARED_LIBS)
set (_PKG_CONFIG_SH_LIBS "${_PKG_CONFIG_SH_LIBS} -l${HDF5_HL_LIB_CORENAME}")
endif ()

set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}")
set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}")
set (_PKG_CONFIG_REQUIRES "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}")
set (_PKG_CONFIG_REQUIRES_PRIVATE "${HDF5_LIB_CORENAME}-${HDF5_PACKAGE_VERSION}")

configure_file (
${HDF_RESOURCES_DIR}/libhdf5.pc.in
Expand Down