blob: 09b5c9a6037773558bd89c2d2885ea0b56563bd8 (
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
|
nemesis/CMakeLists.txt | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64aff5d..bed5ede 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,7 +19,7 @@
find_library( NETCDF_LIBRARY netcdf
$ENV{ACCESS}/lib/shared
$ENV{ACCESS}/lib
- $ENV{NETCDF_DIR}/lib
+ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
$ENV{NETCDF_DIR}/libsrc/.libs
)
@@ -33,13 +33,14 @@
../exodusii/cbind/
$ENV{ACCESS}/lib/shared
$ENV{ACCESS}/lib
+ $ENV{EXODUS_DIR}/${CMAKE_INSTALL_LIBDIR}
)
# Hack for HDF5
find_library( HDF5_LIBRARY hdf5
$ENV{ACCESS}/lib/shared
$ENV{ACCESS}/lib
- $ENV{NETCDF_DIR}/lib
+ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
$ENV{NETCDF_DIR}/libsrc/.libs
/usr/local/hdf5/lib
)
@@ -47,7 +48,7 @@
find_library( HDF5HL_LIBRARY hdf5_hl
$ENV{ACCESS}/lib/shared
$ENV{ACCESS}/lib
- $ENV{NETCDF_DIR}/lib
+ $ENV{NETCDF_DIR}/${CMAKE_INSTALL_LIBDIR}
$ENV{NETCDF_DIR}/libsrc/.libs
/usr/local/hdf5/lib
)
@@ -80,8 +81,8 @@
TARGET_LINK_LIBRARIES( ne_test nemesis ${EXODUS_LIBRARY} ${NETCDF_LIBRARY} ${HDF5HL_LIBRARY} ${HDF5_LIBRARY} ${Z_LIBRARY} ${MATH_LIBRARY})
INSTALL(TARGETS nemesis
- RUNTIME DESTINATION lib COMPONENT Runtime
- LIBRARY DESTINATION lib COMPONENT Runtime
- ARCHIVE DESTINATION lib COMPONENT Development)
+ RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Development)
INSTALL(FILES ${HEADERS} DESTINATION include COMPONENT Development)
|
GitWeb
