blob: 5463fba500197786d3e769f13fe48f9a59860351 (
plain)
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
|
diff -Naur a/cbind/CMakeLists.txt b/cbind/CMakeLists.txt
--- a/cbind/CMakeLists.txt 2016-05-10 13:20:06.408385120 -0600
+++ b/cbind/CMakeLists.txt 2016-05-10 13:22:35.378385120 -0600
@@ -293,9 +293,9 @@
IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS exodus
- RUNTIME DESTINATION lib COMPONENT Runtime
- LIBRARY DESTINATION lib COMPONENT Runtime
- ARCHIVE DESTINATION lib COMPONENT Development)
+ RUNTIME DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT Development)
INSTALL(FILES ${cbind_HEADERS} DESTINATION include COMPONENT Development)
ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
diff -Naur a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt 2016-05-10 13:20:06.418385120 -0600
+++ b/CMakeLists.txt 2016-05-10 13:21:25.928385120 -0600
@@ -27,7 +27,7 @@
find_library( NETCDF_LIBRARY
NAMES netcdf
PATHS "$ENV{ACCESS}/lib"
- "$ENV{NETCDF_DIR}/lib"
+ "$ENV{NETCDF_DIR}/lib${LIB_SUFFIX}"
"$ENV{NETCDF_DIR}/libsrc/.libs"
)
@@ -41,14 +41,14 @@
find_library( HDF5_LIBRARY hdf5
$ENV{ACCESS}/lib/shared
$ENV{ACCESS}/lib
- $ENV{NETCDF_DIR}/lib
+ $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
$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}/lib${LIB_SUFFIX}
$ENV{NETCDF_DIR}/libsrc/.libs
/usr/local/hdf5/lib
)
diff -Naur a/forbind/CMakeLists.txt b/forbind/CMakeLists.txt
--- a/forbind/CMakeLists.txt 2016-05-10 13:20:06.418385120 -0600
+++ b/forbind/CMakeLists.txt 2016-05-10 13:21:25.928385120 -0600
@@ -14,7 +14,7 @@
find_library( NETCDF_LIBRARY
NAMES netcdf
PATHS "$ENV{ACCESS}/lib"
- "$ENV{NETCDF_DIR}/lib"
+ "$ENV{NETCDF_DIR}/lib${LIB_SUFFIX}"
"$ENV{NETCDF_DIR}/libsrc/.libs"
)
@@ -28,14 +28,14 @@
find_library( HDF5_LIBRARY hdf5
$ENV{ACCESS}/lib/shared
$ENV{ACCESS}/lib
- $ENV{NETCDF_DIR}/lib
+ $ENV{NETCDF_DIR}/lib${LIB_SUFFIX}
$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}/lib${LIB_SUFFIX}
$ENV{NETCDF_DIR}/libsrc/.libs
/usr/local/hdf5/lib
)
@@ -61,9 +61,9 @@
IF(NOT EXODUS_INSTALL_NO_LIBRARIES)
INSTALL(TARGETS exoIIv2for
- RUNTIME DESTINATION lib COMPONENT Runtime
- LIBRARY DESTINATION lib COMPONENT Runtime
- ARCHIVE DESTINATION lib COMPONENT Development)
+ RUNTIME DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
+ LIBRARY DESTINATION lib${LIB_SUFFIX} COMPONENT Runtime
+ ARCHIVE DESTINATION lib${LIB_SUFFIX} COMPONENT Development)
INSTALL(FILES ${forbind_HEADERS} DESTINATION include COMPONENT Development)
ENDIF(NOT EXODUS_INSTALL_NO_LIBRARIES)
|
GitWeb