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
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
|
Author: Gilles Fillipini <pini@debian.org>
Description: Build using new HDF5 1.8.13 packages with separate libs
Bug-Debian: http://bugs.debian.org/75421
Forwarded: no
Last-Updated: 2014-07-29
Index: exodusii-6.02.dfsg.1/exodus/CMakeLists.txt
===================================================================
--- exodusii-6.02.dfsg.1.orig/exodus/CMakeLists.txt 2014-07-24 16:51:24.000000000 +0200
+++ exodusii-6.02.dfsg.1/exodus/CMakeLists.txt 2014-07-24 17:35:52.113595013 +0200
@@ -38,21 +38,7 @@
$ENV{NETCDF_DIR}/ncdump
)
-# Hack for HDF5
-find_library( HDF5_LIBRARY hdf5
- $ENV{ACCESS}/lib/shared
- $ENV{ACCESS}/lib
- $ENV{NETCDF_DIR}/lib
- $ENV{NETCDF_DIR}/libsrc/.libs
- /usr/local/hdf5/lib
- )
-find_library( HDF5HL_LIBRARY hdf5_hl
- $ENV{ACCESS}/lib/shared
- $ENV{ACCESS}/lib
- $ENV{NETCDF_DIR}/lib
- $ENV{NETCDF_DIR}/libsrc/.libs
- /usr/local/hdf5/lib
- )
+find_package(HDF5)
# Check for ZLib, but only if using HDF5.
FIND_PACKAGE(ZLIB)
Index: exodusii-6.02.dfsg.1/nemesis/CMakeLists.txt
===================================================================
--- exodusii-6.02.dfsg.1.orig/nemesis/CMakeLists.txt 2014-07-24 16:51:24.000000000 +0200
+++ exodusii-6.02.dfsg.1/nemesis/CMakeLists.txt 2014-07-24 17:38:03.798020419 +0200
@@ -34,22 +34,7 @@
$ENV{ACCESS}/lib
)
-# Hack for HDF5
-find_library( HDF5_LIBRARY hdf5
- $ENV{ACCESS}/lib/shared
- $ENV{ACCESS}/lib
- $ENV{NETCDF_DIR}/lib
- $ENV{NETCDF_DIR}/libsrc/.libs
- /usr/local/hdf5/lib
- )
-
-find_library( HDF5HL_LIBRARY hdf5_hl
- $ENV{ACCESS}/lib/shared
- $ENV{ACCESS}/lib
- $ENV{NETCDF_DIR}/lib
- $ENV{NETCDF_DIR}/libsrc/.libs
- /usr/local/hdf5/lib
- )
+find_package(HDF5)
find_library(Z_LIBRARY z
/usr/local/zlib/lib
@@ -73,11 +58,11 @@
)
ADD_LIBRARY(nemesis ${SOURCES})
-TARGET_LINK_LIBRARIES(nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
+TARGET_LINK_LIBRARIES(nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${Z_LIBRARY} ${MATH_LIBRARY})
set_target_properties(nemesis PROPERTIES VERSION 3.09.0 SOVERSION 3)
ADD_EXECUTABLE(ne_test ne_ctest_wrap.c)
-TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
+TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5_HL_LIBRARIES} ${HDF5_C_LIBRARIES} ${Z_LIBRARY} ${MATH_LIBRARY})
INSTALL(TARGETS nemesis
RUNTIME DESTINATION lib COMPONENT Runtime
Index: exodusii-6.02.dfsg.1/exodus/cbind/CMakeLists.txt
===================================================================
--- exodusii-6.02.dfsg.1.orig/exodus/cbind/CMakeLists.txt 2014-07-24 16:51:24.000000000 +0200
+++ exodusii-6.02.dfsg.1/exodus/cbind/CMakeLists.txt 2014-07-24 17:40:07.530177780 +0200
@@ -278,7 +278,7 @@
ADD_LIBRARY(exoIIv2c ${EXODUS_LIBRARY_TYPE} ${cbind_SRCS})
-TARGET_LINK_LIBRARIES(exoIIv2c ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${HDF5HL_LIBRARY} ${ZLIB_LIBRARY})
+TARGET_LINK_LIBRARIES(exoIIv2c ${NETCDF_LIBRARY} ${HDF5_C_LIBRARIES} ${HDF5_HL_LIBRARIES} ${ZLIB_LIBRARY})
IF(MSVC)
set_target_properties(exoIIv2c PROPERTIES COMPILE_DEFINITIONS _CRT_SECURE_NO_WARNINGS)
Index: exodusii-6.02.dfsg.1/exodus/forbind/CMakeLists.txt
===================================================================
--- exodusii-6.02.dfsg.1.orig/exodus/forbind/CMakeLists.txt 2013-12-14 19:32:57.000000000 +0100
+++ exodusii-6.02.dfsg.1/exodus/forbind/CMakeLists.txt 2014-07-24 17:40:15.758454657 +0200
@@ -24,21 +24,7 @@
$ENV{NETCDF_DIR}/ncdump
)
-# Hack for HDF5
-find_library( HDF5_LIBRARY hdf5
- $ENV{ACCESS}/lib/shared
- $ENV{ACCESS}/lib
- $ENV{NETCDF_DIR}/lib
- $ENV{NETCDF_DIR}/libsrc/.libs
- /usr/local/hdf5/lib
- )
-find_library( HDF5HL_LIBRARY hdf5_hl
- $ENV{ACCESS}/lib/shared
- $ENV{ACCESS}/lib
- $ENV{NETCDF_DIR}/lib
- $ENV{NETCDF_DIR}/libsrc/.libs
- /usr/local/hdf5/lib
- )
+find_package(HDF5)
INCLUDE_DIRECTORIES(
"${CMAKE_CURRENT_SOURCE_DIR}/include"
@@ -53,7 +39,7 @@
ADD_LIBRARY(exoIIv2for ${EXODUS_LIBRARY_TYPE} ${forbind_SRCS})
-TARGET_LINK_LIBRARIES(exoIIv2for exoIIv2c ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${HDF5HL_LIBRARY})
+TARGET_LINK_LIBRARIES(exoIIv2for exoIIv2c ${NETCDF_LIBRARY} ${HDF5_C_LIBRARIES} ${HDF5_HL_LIBRARIES})
IF(EXODUS_LIBRARY_PROPERTIES)
SET_TARGET_PROPERTIES(exoIIv2for PROPERTIES ${EXODUS_LIBRARY_PROPERTIES})
|
