You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/sci-libs/exodusii/files/exodusii-6.09-multilib.patch

88 lines
2.8 KiB

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)