1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
Description: Append HDF5 library & include paths to nc-config & netcdf.pc.
Fixes linking issues with netcdf and the hdf5 libraries it's built with:
/usr/bin/ld: cannot find -lhdf5_hl
/usr/bin/ld: cannot find -lhdf5
Author: Bas Couwenberg <sebastic@debian.org>
Forwarded: not-needed
Index: netcdf-parallel-4.7.3/CMakeLists.txt
===================================================================
--- netcdf-parallel-4.7.3.orig/CMakeLists.txt
+++ netcdf-parallel-4.7.3/CMakeLists.txt
@@ -1866,6 +1866,17 @@ SET(libdir ${CMAKE_INSTALL_PREFIX}/${CMA
SET(includedir ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR})
SET(CC ${CMAKE_C_COMPILER})
+SET(HDF5_LIBS "")
+SET(HDF5_INCS "")
+
+IF(USE_HDF5 AND DEFINED HDF5_LIBRARY_PATH)
+ SET(HDF5_LIBS "-L${HDF5_LIBRARY_PATH}")
+ENDIF(USE_HDF5 AND DEFINED HDF5_LIBRARY_PATH)
+
+IF(USE_HDF5 AND DEFINED HDF5_INCLUDE_PATH)
+ SET(HDF5_INCS "-I${HDF5_INCLUDE_PATH}")
+ENDIF(USE_HDF5 AND DEFINED HDF5_LIBRARY_PATH)
+
# Process all dependency libraries and create a string
# used when parsing netcdf.pc.in
Index: netcdf-parallel-4.7.3/nc-config.cmake.in
===================================================================
--- netcdf-parallel-4.7.3.orig/nc-config.cmake.in
+++ netcdf-parallel-4.7.3/nc-config.cmake.in
@@ -10,8 +10,8 @@ libdir="@CMAKE_INSTALL_PREFIX@/@CMAKE_IN
includedir="@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
cc="@CMAKE_C_COMPILER@"
-cflags="-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
-libs="-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ @NC_LIBS@"
+cflags="-I@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ @HDF5_INCS£"
+libs="-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ @HDF5_LIBS@ @NC_LIBS@"
libsprivate="@LIBS@"
HAS_STATIC=""
Index: netcdf-parallel-4.7.3/netcdf.pc.in
===================================================================
--- netcdf-parallel-4.7.3.orig/netcdf.pc.in
+++ netcdf-parallel-4.7.3/netcdf.pc.in
@@ -9,12 +9,16 @@ has_nc4="@HAS_NC4@"
has_hdf4="@HAS_HDF4@"
has_pnetcdf="@HAS_PNETCDF@"
has_hdf5="@HAS_HDF5@"
+has_logging="@HAS_LOGGING@"
+has_CDF5="@HAS_CDF5@"
+has_szlib="@HAS_SZLIB@"
+has_parallel="@HAS_PARALLEL@"
version="@PACKAGE_NAME@ @PACKAGE_VERSION@"
Name: @PACKAGE@
Description: NetCDF Client Library for C
URL: http://www.unidata.ucar.edu/netcdf
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} @NC_LIBS@
-Libs.private: @LIBS@
-Cflags: -I${includedir}
+Libs: -L${libdir} @NC_LIBS@ @HDF5_LIBS@
+Libs.private: @LIBS@
+Cflags: -I${includedir} @HDF5_INCS@
|
