diff options
| author |   Christoph Junghans <ottxor@gentoo.org> | 2016-05-11 10:27:16 -0600 |
|---|---|---|
| committer | Christoph Junghans <ottxor@gentoo.org> | 2016-05-11 10:27:29 -0600 |
| commit | fd590279e40969ffd2c75fcf7bc672e3b3e94a29 (patch) | |
| tree | 62f71f68cd2160fc01e6aeb8e3db095b77e3bd56 /sci-libs/nemesis/files | |
| parent | sci-libs/nemesis: build fix for newer exodusii (bug #582726) (diff) | |
| download | gentoo-fd590279e40969ffd2c75fcf7bc672e3b3e94a29.tar.gz gentoo-fd590279e40969ffd2c75fcf7bc672e3b3e94a29.tar.bz2 gentoo-fd590279e40969ffd2c75fcf7bc672e3b3e94a29.zip | |
sci-libs/nemesis: version bump
Package-Manager: portage-2.2.28
Diffstat (limited to 'sci-libs/nemesis/files')
| -rw-r--r-- | sci-libs/nemesis/files/nemesis-6.09-multilib.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/sci-libs/nemesis/files/nemesis-6.09-multilib.patch b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch new file mode 100644 index 000000000000..d0f05f23a2d2 --- /dev/null +++ b/sci-libs/nemesis/files/nemesis-6.09-multilib.patch @@ -0,0 +1,53 @@ + nemesis/CMakeLists.txt | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/nemesis/CMakeLists.txt b/nemesis/CMakeLists.txt +index 64aff5d..bed5ede 100644 +--- a/nemesis/CMakeLists.txt ++++ b/nemesis/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) + |