commit: 24b0bf330b0a38d5dbc96c0356ae93406d31f33b
Author: Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 19:44:09 2016 +0000
Commit: Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 19:44:26 2016 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=24b0bf33
sci-libs/trilinos: version bump
Package-Manager: portage-2.3.0
...nos-12.10.1-fix_install_paths_for_destdir.patch | 603 +++++++++++++++++++++
sci-libs/trilinos/trilinos-12.10.1.ebuild | 210 +++++++
2 files changed, 813 insertions(+)
diff --git
a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch
b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch
new file mode 100644
index 0000000..2e8960e
--- /dev/null
+++
b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch
@@ -0,0 +1,603 @@
+diff -Naur trilinos-12.10.1-Source.orig/commonTools/gtest/CMakeLists.txt
trilinos-12.10.1-Source/commonTools/gtest/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/commonTools/gtest/CMakeLists.txt
2016-12-05 13:46:36.981584433 -0700
++++ trilinos-12.10.1-Source/commonTools/gtest/CMakeLists.txt 2016-12-05
13:53:32.265171949 -0700
+@@ -31,7 +31,7 @@
+ )
+
+ #install gtest header into the correct subdir.
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
++INSTALL(FILES ${HEADERS} DESTINATION ${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
+
+
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/kokkos/containers/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/kokkos/containers/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/kokkos/containers/src/CMakeLists.txt
2016-12-05 13:46:37.071535392 -0700
++++ trilinos-12.10.1-Source/packages/kokkos/containers/src/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -15,7 +15,7 @@
+ FILE(GLOB HEADERS_IMPL impl/*.hpp)
+ FILE(GLOB SOURCES impl/*.cpp)
+
+-SET(TRILINOS_INCDIR
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ INSTALL(FILES ${HEADERS_IMPL} DESTINATION ${TRILINOS_INCDIR}/impl/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/kokkos/core/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/kokkos/core/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/kokkos/core/src/CMakeLists.txt
2016-12-05 13:46:37.061540841 -0700
++++ trilinos-12.10.1-Source/packages/kokkos/core/src/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -40,7 +40,7 @@
+
+ #-----------------------------------------------------------------------------
+
+-SET(TRILINOS_INCDIR
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/kokkos/core/src/impl/CMakeLists.txt
trilinos-12.10.1-Source/packages/kokkos/core/src/impl/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/kokkos/core/src/impl/CMakeLists.txt
2016-12-05 13:46:37.061540841 -0700
++++ trilinos-12.10.1-Source/packages/kokkos/core/src/impl/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -12,7 +12,7 @@
+ DEPLIBS
+ )
+
+-SET(TRILINOS_INCDIR
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/impl/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/rol/adapters/belos/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/rol/adapters/belos/src/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/rol/adapters/belos/src/CMakeLists.txt
2016-12-05 13:46:37.111513596 -0700
++++ trilinos-12.10.1-Source/packages/rol/adapters/belos/src/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -39,4 +39,4 @@
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur
trilinos-12.10.1-Source.orig/packages/rol/adapters/epetra/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/rol/adapters/epetra/src/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/rol/adapters/epetra/src/CMakeLists.txt
2016-12-05 13:46:37.111513596 -0700
++++ trilinos-12.10.1-Source/packages/rol/adapters/epetra/src/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -42,4 +42,4 @@
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur
trilinos-12.10.1-Source.orig/packages/rol/adapters/sacado/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/rol/adapters/sacado/src/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/rol/adapters/sacado/src/CMakeLists.txt
2016-12-05 13:46:37.101519046 -0700
++++ trilinos-12.10.1-Source/packages/rol/adapters/sacado/src/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -37,4 +37,4 @@
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur
trilinos-12.10.1-Source.orig/packages/rol/adapters/teuchos/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/rol/adapters/teuchos/src/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/rol/adapters/teuchos/src/CMakeLists.txt
2016-12-05 13:46:37.101519046 -0700
++++ trilinos-12.10.1-Source/packages/rol/adapters/teuchos/src/CMakeLists.txt
2016-12-05 14:37:03.361602958 -0700
+@@ -35,4 +35,4 @@
+ )
+
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur
trilinos-12.10.1-Source.orig/packages/rol/adapters/thyra/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/rol/adapters/thyra/src/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/rol/adapters/thyra/src/CMakeLists.txt
2016-12-05 13:46:37.111513596 -0700
++++ trilinos-12.10.1-Source/packages/rol/adapters/thyra/src/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -49,4 +49,4 @@
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur
trilinos-12.10.1-Source.orig/packages/rol/adapters/tpetra/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/rol/adapters/tpetra/src/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/rol/adapters/tpetra/src/CMakeLists.txt
2016-12-05 13:46:37.111513596 -0700
++++ trilinos-12.10.1-Source/packages/rol/adapters/tpetra/src/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -46,4 +46,4 @@
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
2016-12-05 13:46:37.401355574 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -46,7 +46,7 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/)
+
+ ADD_SUBDIRECTORY(main)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
2016-12-05 13:46:37.401355574 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -34,5 +34,5 @@
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
2016-12-05 13:46:37.391361023 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -21,5 +21,5 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
2016-12-05 13:46:37.391361023 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -46,4 +46,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
2016-12-05 13:46:37.381366472 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -49,7 +49,7 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
+
+ # AGS: I moved this to the bottom so that the link order was correct
+ # with -lstk_io_uti before -lstk_io. I think the DEPLIBS added in
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
2016-12-05 13:46:37.381366472 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -45,4 +45,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
2016-12-05 13:46:37.391361023 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -54,7 +54,7 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
+
+ INSTALL(FILES ${HEADERS_IMPL} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
2016-12-05 13:46:37.391361023 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -48,5 +48,5 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
2016-12-05 13:46:37.391361023 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -54,4 +54,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
2016-12-05 13:46:37.381366472 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -68,5 +68,5 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
2016-12-05 13:46:37.381366472 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -35,5 +35,5 @@
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
2016-12-05 13:46:37.381366472 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -37,5 +37,5 @@
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
2016-12-05 13:46:37.381366472 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -36,5 +36,5 @@
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
2016-12-05 13:46:37.381366472 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -35,5 +35,5 @@
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
2016-12-05 13:46:37.381366472 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
2016-12-05 13:53:32.265171949 -0700
+@@ -35,5 +35,5 @@
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
2016-12-05 13:46:37.381366472 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -35,5 +35,5 @@
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
2016-12-05 13:46:37.381366472 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -35,5 +35,5 @@
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
2016-12-05 13:46:37.401355574 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -46,4 +46,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
2016-12-05 13:46:37.401355574 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -18,4 +18,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
2016-12-05 13:46:37.381366472 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -62,4 +62,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
2016-12-05 13:46:37.381366472 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -34,5 +34,5 @@
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
2016-12-05 13:46:37.401355574 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -54,4 +54,4 @@
+ )
+
+ #INSTALL(FILES ${HEADERS} DESTINATION
+-#
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
++# ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
2016-12-05 13:46:37.391361023 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -16,6 +16,6 @@
+ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
+
+ INSTALL(FILES stk_config.h DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STKClassic_config.h DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
2016-12-05 13:46:37.391361023 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -82,5 +82,5 @@
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
2016-12-05 13:46:37.391361023 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -80,4 +80,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
2016-12-05 13:46:37.391361023 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -61,4 +61,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
2016-12-05 13:46:37.391361023 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -50,4 +50,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
2016-12-05 13:46:37.391361023 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -49,4 +49,4 @@
+ )
+
+ #INSTALL(FILES ${HEADERS} DESTINATION
+-#
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/)
++# ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
2016-12-05 13:46:37.391361023 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -46,4 +46,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
2016-12-05 13:46:37.411350125 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -77,4 +77,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/CMakeLists.txt
2016-12-05 13:46:37.401355574 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -78,7 +78,7 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
+
+ # AGS: I moved this to the bottom so that the link order was correct
+ # with -lstk_io_uti before -lstk_io. I think the DEPLIBS added in
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/util/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/util/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/util/CMakeLists.txt
2016-12-05 13:46:37.401355574 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/util/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -76,4 +76,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
2016-12-05 13:46:37.421344676 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -84,14 +84,13 @@
+ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
+
+ INSTALL(FILES ${HEADERS_IMPL} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
+
+ INSTALL(FILES ${HEADERS_ELEMGRAPH} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph)
+
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+-
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
2016-12-05 13:46:37.421344676 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -71,4 +71,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_search/stk_search/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_search/stk_search/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_search/stk_search/CMakeLists.txt
2016-12-05 13:46:37.401355574 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_search/stk_search/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -69,4 +69,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
2016-12-05 13:46:37.431339227 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -68,5 +68,5 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_topology/stk_topology/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_topology/stk_topology/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_topology/stk_topology/CMakeLists.txt
2016-12-05 13:46:37.401355574 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_topology/stk_topology/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -71,7 +71,7 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/)
+
+ INSTALL(FILES ${DETAIL_HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
2016-12-05 13:46:37.431339227 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -5,4 +5,4 @@
+ FILE(GLOB HEADERS *.hpp)
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/CMakeLists.txt
2016-12-05 13:46:37.411350125 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/CMakeLists.txt
2016-12-05 13:56:03.782564712 -0700
+@@ -18,6 +18,6 @@
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+
+ INSTALL(FILES stk_config.h stk_kokkos_macros.h DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STK_Trilinos_config.h DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
2016-12-05 13:46:37.411350125 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -75,5 +75,5 @@
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
2016-12-05 13:46:37.411350125 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -73,4 +73,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
2016-12-05 13:46:37.411350125 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -92,4 +92,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
2016-12-05 13:46:37.411350125 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -70,5 +70,5 @@
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
2016-12-05 13:46:37.411350125 -0700
++++
trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -78,4 +78,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt
trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/util/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt
2016-12-05 13:46:37.411350125 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/util/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -75,4 +75,4 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
+diff -Naur
trilinos-12.10.1-Source.orig/packages/teuchos/kokkoscompat/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/teuchos/kokkoscompat/src/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/teuchos/kokkoscompat/src/CMakeLists.txt
2016-12-05 13:46:37.371371921 -0700
++++ trilinos-12.10.1-Source/packages/teuchos/kokkoscompat/src/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -27,7 +27,7 @@
+ # FIXME (mfh 19 Dec 2014) We should rely on TriBITS to handle
+ # installation.
+
+-SET(TRILINOS_INCDIR
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/trios/libraries/support/CMakeLists.txt
trilinos-12.10.1-Source/packages/trios/libraries/support/CMakeLists.txt
+---
trilinos-12.10.1-Source.orig/packages/trios/libraries/support/CMakeLists.txt
2016-12-05 13:46:37.531284737 -0700
++++ trilinos-12.10.1-Source/packages/trios/libraries/support/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -168,6 +168,6 @@
+
+ ########### install targets ###############
+
+-# INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
++# INSTALL(FILES ${MODULES} DESTINATION include)
+
+ TRIBITS_SUBPACKAGE_POSTPROCESS()
+diff -Naur trilinos-12.10.1-Source.orig/packages/zoltan/src/CMakeLists.txt
trilinos-12.10.1-Source/packages/zoltan/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/zoltan/src/CMakeLists.txt
2016-12-05 13:46:37.231448208 -0700
++++ trilinos-12.10.1-Source/packages/zoltan/src/CMakeLists.txt 2016-12-05
13:53:32.275166500 -0700
+@@ -678,5 +678,5 @@
+ IMPORTEDLIBS ${IMPORTEDLIBS}
+ )
+
+-INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
++INSTALL(FILES ${MODULES} DESTINATION include)
+
+diff -Naur
trilinos-12.10.1-Source.orig/packages/zoltan/src/fdriver/CMakeLists.txt
trilinos-12.10.1-Source/packages/zoltan/src/fdriver/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/zoltan/src/fdriver/CMakeLists.txt
2016-12-05 13:46:37.231448208 -0700
++++ trilinos-12.10.1-Source/packages/zoltan/src/fdriver/CMakeLists.txt
2016-12-05 13:53:32.275166500 -0700
+@@ -33,6 +33,6 @@
+
+ # What is a good location for executables zdrive and zCPPdrive?
+ # When should they be moved there? During install? Or build?
+-#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION
${CMAKE_INSTALL_PREFIX}/bin)
++#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION bin)
+
+ ENDIF()
diff --git a/sci-libs/trilinos/trilinos-12.10.1.ebuild
b/sci-libs/trilinos/trilinos-12.10.1.ebuild
new file mode 100644
index 0000000..878ea8f
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-12.10.1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs multilib toolchain-funcs
+
+DESCRIPTION="Scientific library collection for large scale problems"
+HOMEPAGE="http://trilinos.sandia.gov/";
+SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz";
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+
+IUSE="
+ adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre
+ matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse
+ superlu taucs tbb test threads tvmet yaml zlib
+"
+
+# TODO: fix export cmake function for tests
+RESTRICT="test"
+
+RDEPEND="
+ sys-libs/binutils-libs
+ virtual/blas
+ virtual/lapack
+ virtual/mpi
+ adolc? ( sci-libs/adolc )
+ arprec? ( sci-libs/arprec )
+ boost? ( dev-libs/boost )
+ clp? ( sci-libs/coinor-clp )
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
+ eigen? ( dev-cpp/eigen:3 )
+ gtest? ( dev-cpp/gtest )
+ hdf5? ( sci-libs/hdf5[mpi] )
+ hypre? ( sci-libs/hypre )
+ hwloc? ( sys-apps/hwloc )
+ matio? ( sci-libs/matio )
+ mkl? ( sci-libs/mkl )
+ metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
+ mumps? ( sci-libs/mumps )
+ netcdf? ( sci-libs/netcdf )
+ petsc? ( sci-mathematics/petsc )
+ qd? ( sci-libs/qd )
+ qt4? ( dev-qt/qtgui:4 )
+ scalapack? ( virtual/scalapack )
+ scotch? ( sci-libs/scotch )
+ sparse? ( sci-libs/cxsparse sci-libs/umfpack )
+ superlu? ( sci-libs/superlu )
+ taucs? ( sci-libs/taucs )
+ tbb? ( dev-cpp/tbb )
+ tvmet? ( dev-libs/tvmet )
+ yaml? ( dev-cpp/yaml-cpp )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${P}-Source"
+
+trilinos_conf() {
+ local dirs libs d
+ for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
+ dirs="${dirs};${d:2}"
+ done
+ [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
+ for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
+ libs="${libs};${d:2}"
+ done
+ [[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
+ dirs=""
+ for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
+ dirs="${dirs};${d:2}"
+ done
+ [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
+}
+
+trilinos_enable() {
+ cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}}
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
+ "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch
+}
+
+src_configure() {
+
+ # temporarily disable pyTrilinos compilation
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"
+ -DTrilinos_ENABLE_ALL_PACKAGES=ON
+ -DZoltan2_ENABLE_Experimental=ON
+ -DTrilinos_ENABLE_SEACASExodus=$(usex netcdf)
+ -DTrilinos_ENABLE_SEACASExodiff=$(usex netcdf)
+ -DTrilinos_ENABLE_PyTrilinos=OFF
+ -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
+
-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
+
-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
+ -DTPL_ENABLE_BinUtils=ON
+ -DTPL_ENABLE_MPI=ON
+ -DTPL_ENABLE_BLAS=ON
+ -DTPL_ENABLE_LAPACK=ON
+ $(cmake-utils_use test Trilinos_ENABLE_TESTS)
+ $(trilinos_enable adolc)
+ $(trilinos_enable arprec)
+ $(trilinos_enable boost Boost)
+ $(trilinos_enable boost BoostLib)
+ $(trilinos_enable cppunit Cppunit)
+ $(trilinos_enable clp Clp)
+ $(trilinos_enable cuda)
+ $(trilinos_enable cuda CUSPARSE)
+ $(trilinos_enable cuda Thrust)
+ $(trilinos_enable eigen Eigen)
+ $(trilinos_enable gtest gtest)
+ $(trilinos_enable glpk)
+ $(trilinos_enable hdf5)
+ $(trilinos_enable hwloc)
+ $(trilinos_enable hypre)
+ $(trilinos_enable matio Matio)
+ $(trilinos_enable metis)
+ $(trilinos_enable mkl)
+ $(trilinos_enable mkl PARDISO_MKL)
+ $(trilinos_enable mumps)
+ $(trilinos_enable netcdf Netcdf)
+ $(trilinos_enable petsc)
+ $(trilinos_enable qd)
+ $(trilinos_enable qt4 QT)
+ $(trilinos_enable scalapack)
+ $(trilinos_enable scalapack BLACS)
+ $(trilinos_enable scotch Scotch)
+ $(trilinos_enable sparse AMD)
+ $(trilinos_enable sparse CSparse)
+ $(trilinos_enable sparse UMFPACK)
+ $(trilinos_enable superlu SuperLU)
+ $(trilinos_enable taucs)
+ $(trilinos_enable tbb)
+ $(trilinos_enable threads Pthread)
+ $(trilinos_enable tvmet)
+ $(trilinos_enable yaml yaml-cpp)
+ $(trilinos_enable zlib Zlib)
+ )
+
+ use eigen && \
+ mycmakeargs+=(
+ -DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
+ )
+ use hypre && \
+ mycmakeargs+=(
+ -DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
+ )
+ use scotch && \
+ mycmakeargs+=(
+ -DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
+ )
+
+ # cxsparse is a rewrite of csparse + extras
+ use sparse && \
+ mycmakeargs+=(
+ -DCSparse_LIBRARY_NAMES="cxsparse"
+ )
+
+ # mandatory blas and lapack
+ trilinos_conf blas BLAS
+ trilinos_conf lapack LAPACK
+ use superlu && trilinos_conf superlu SuperLU
+ use metis && trilinos_conf metis METIS
+
+ # blacs library is included in scalapack these days
+ if use scalapack; then
+ trilinos_conf scalapack SCALAPACK
+ mycmakeargs+=(
+ -DBLACS_LIBRARY_NAMES="scalapack"
+ -DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
+ )
+ fi
+
+ # TODO: do we need that line?
+ export CC=mpicc CXX=mpicxx && tc-export CC CXX
+
+ # cmake-utils eclass patches the base directory CMakeLists.txt
+ # which does not work for complex Trilinos CMake modules
+ CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
+
+ # TODO:
+ # python bindings with python-r1
+ # fix hypre bindings
+ # fix hdf5
+ # cuda/thrust is untested
+ # do we always need mpi? and for all packages: blah[mpi] ?
+ # install docs, examples
+ # see what packages are related, do we need REQUIRED_USE
+ # proper use flags description
+ # add more use flags/packages ?
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
+ # has a chance to pick up the libraries...
+ cat >> "${T}"/99trilinos <<- EOF
+ LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
+ EOF
+ doenvd "${T}"/99trilinos
+}
