aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Maier <tamiko@gentoo.org>2019-04-02 09:24:38 -0500
committerMatthias Maier <tamiko@gentoo.org>2019-04-03 22:57:51 -0500
commitd7367338b1cf7b5d6a8a5344755564145875d195 (patch)
tree523f5aa1a194cbdace4c7bb69ddaabac06e401f0
parentsci-libs/itk: version bump 5.0_rc1 (diff)
downloadsci-d7367338b1cf7b5d6a8a5344755564145875d195.tar.gz
sci-d7367338b1cf7b5d6a8a5344755564145875d195.tar.bz2
sci-d7367338b1cf7b5d6a8a5344755564145875d195.zip
sci-libs/trilinos: version bump to 12.14.1
Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Matthias Maier <tamiko@gentoo.org>
-rw-r--r--sci-libs/trilinos/Manifest1
-rw-r--r--sci-libs/trilinos/files/trilinos-12.14.1-fix_install_paths_for_destdir.patch973
-rw-r--r--sci-libs/trilinos/trilinos-12.12.1-r1.ebuild2
-rw-r--r--sci-libs/trilinos/trilinos-12.14.1.ebuild206
4 files changed, 1181 insertions, 1 deletions
diff --git a/sci-libs/trilinos/Manifest b/sci-libs/trilinos/Manifest
index 38b8b8262..82195a6c0 100644
--- a/sci-libs/trilinos/Manifest
+++ b/sci-libs/trilinos/Manifest
@@ -1 +1,2 @@
DIST trilinos-12.12.1-Source.tar.gz 99892109 BLAKE2B e9abdbbe664500a4c32776c687c6ffe9726c59d4f41fac7b86440b851e15533ba4cd8b6248743386e83e9a4b370cbcb0b7b9dbf9f136588f25608d56116cb70a SHA512 ebe1198f85a1ea84e53f6b420cff809bb3c1887b67281d95838479162c89ec60ce728ed5d87554d5b59d6b3615b2f72fa4d14c54104b29dc228c1e8a9924a7bf
+DIST trilinos-12.14.1.tar.gz 129036436 BLAKE2B e7401df2ff8408a7af4a8e90d93b1929df65228c4f5cf3c754d20ebdfa8f3835800f540e87c1198e0baf2fefe0920618ae497f59373720754ab0c9dc1da93136 SHA512 dfff0e0582cb5ad12614dd53e9635572c8d1ee86d96f432f5a6e046af63edb13f6bfa3037204ab89fbb0d27e9be9bd9661d47efb41ab2a6e421bca5eba6b6a87
diff --git a/sci-libs/trilinos/files/trilinos-12.14.1-fix_install_paths_for_destdir.patch b/sci-libs/trilinos/files/trilinos-12.14.1-fix_install_paths_for_destdir.patch
new file mode 100644
index 000000000..c59d278ca
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-12.14.1-fix_install_paths_for_destdir.patch
@@ -0,0 +1,973 @@
+diff --git a/cmake/tribits/examples/tpls/SimpleTpl/CMakeLists.txt b/cmake/tribits/examples/tpls/SimpleTpl/CMakeLists.txt
+index e95f4289..e1244b48 100644
+--- a/cmake/tribits/examples/tpls/SimpleTpl/CMakeLists.txt
++++ b/cmake/tribits/examples/tpls/SimpleTpl/CMakeLists.txt
+@@ -4,12 +4,12 @@ ADD_LIBRARY(simpletpl SimpleTpl.hpp SimpleTpl.cpp)
+
+ INSTALL(
+ TARGETS simpletpl
+- RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
+- LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
+- ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
++ RUNTIME DESTINATION "lib"
++ LIBRARY DESTINATION "lib"
++ ARCHIVE DESTINATION "lib"
+ )
+
+ INSTALL(
+ FILES SimpleTpl.hpp
+- DESTINATION "${CMAKE_INSTALL_PREFIX}/include"
++ DESTINATION "include"
+ )
+diff --git a/commonTools/gtest/CMakeLists.txt b/commonTools/gtest/CMakeLists.txt
+index 35075d69..563955e8 100644
+--- a/commonTools/gtest/CMakeLists.txt
++++ b/commonTools/gtest/CMakeLists.txt
+@@ -34,7 +34,7 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ #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/)
+
+ #
+ # D) Do standard postprocessing
+diff --git a/packages/intrepid2/src/CMakeLists.txt b/packages/intrepid2/src/CMakeLists.txt
+index c01d0081..65830941 100644
+--- a/packages/intrepid2/src/CMakeLists.txt
++++ b/packages/intrepid2/src/CMakeLists.txt
+@@ -4,7 +4,7 @@
+
+ TRIBITS_CONFIGURE_FILE(Intrepid2_config.h)
+
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #
+ # B) Define the header and source files (and directories)
+diff --git a/packages/kokkos-kernels/src/CMakeLists.txt b/packages/kokkos-kernels/src/CMakeLists.txt
+index da6afef5..06375151 100644
+--- a/packages/kokkos-kernels/src/CMakeLists.txt
++++ b/packages/kokkos-kernels/src/CMakeLists.txt
+@@ -4,7 +4,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+diff --git a/packages/kokkos/containers/src/CMakeLists.txt b/packages/kokkos/containers/src/CMakeLists.txt
+index e68fcad5..289d23bf 100644
+--- a/packages/kokkos/containers/src/CMakeLists.txt
++++ b/packages/kokkos/containers/src/CMakeLists.txt
+@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ if(KOKKOS_LEGACY_TRIBITS)
+
+diff --git a/packages/kokkos/core/src/CMakeLists.txt b/packages/kokkos/core/src/CMakeLists.txt
+index eb026167..2722d810 100644
+--- a/packages/kokkos/core/src/CMakeLists.txt
++++ b/packages/kokkos/core/src/CMakeLists.txt
+@@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+diff --git a/packages/kokkos/core/src/impl/CMakeLists.txt b/packages/kokkos/core/src/impl/CMakeLists.txt
+index c543194d..1021f421 100644
+--- a/packages/kokkos/core/src/impl/CMakeLists.txt
++++ b/packages/kokkos/core/src/impl/CMakeLists.txt
+@@ -12,7 +12,7 @@ TRIBITS_ADD_LIBRARY(
+ 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 --git a/packages/rol/adapters/arrayfire/src/CMakeLists.txt b/packages/rol/adapters/arrayfire/src/CMakeLists.txt
+index 76e71e3e..f8815986 100644
+--- a/packages/rol/adapters/arrayfire/src/CMakeLists.txt
++++ b/packages/rol/adapters/arrayfire/src/CMakeLists.txt
+@@ -35,4 +35,4 @@ IF (ROL_ENABLE_ArrayFireCPU)
+ APPEND_GLOB(HEADERS ${DIR}/*.hpp)
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/belos/src/CMakeLists.txt b/packages/rol/adapters/belos/src/CMakeLists.txt
+index 198ee38d..878d1b82 100644
+--- a/packages/rol/adapters/belos/src/CMakeLists.txt
++++ b/packages/rol/adapters/belos/src/CMakeLists.txt
+@@ -43,4 +43,4 @@ IF (ROL_ENABLE_Belos)
+
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/eigen/src/CMakeLists.txt b/packages/rol/adapters/eigen/src/CMakeLists.txt
+index 54a00e2b..fe46e5bb 100644
+--- a/packages/rol/adapters/eigen/src/CMakeLists.txt
++++ b/packages/rol/adapters/eigen/src/CMakeLists.txt
+@@ -38,4 +38,4 @@ IF (ROL_ENABLE_Eigen)
+
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/epetra/src/CMakeLists.txt b/packages/rol/adapters/epetra/src/CMakeLists.txt
+index 99fb601d..11b20e44 100644
+--- a/packages/rol/adapters/epetra/src/CMakeLists.txt
++++ b/packages/rol/adapters/epetra/src/CMakeLists.txt
+@@ -41,4 +41,4 @@ IF (ROL_ENABLE_Epetra)
+
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/minitensor/src/CMakeLists.txt b/packages/rol/adapters/minitensor/src/CMakeLists.txt
+index b365e620..e4f4b971 100644
+--- a/packages/rol/adapters/minitensor/src/CMakeLists.txt
++++ b/packages/rol/adapters/minitensor/src/CMakeLists.txt
+@@ -76,4 +76,4 @@ IF (ROL_ENABLE_Boost AND ROL_ENABLE_MiniTensor)
+
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/mpi/src/CMakeLists.txt b/packages/rol/adapters/mpi/src/CMakeLists.txt
+index e979c298..5354b856 100644
+--- a/packages/rol/adapters/mpi/src/CMakeLists.txt
++++ b/packages/rol/adapters/mpi/src/CMakeLists.txt
+@@ -42,4 +42,4 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/function)
+
+
+
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/pebbl/src/CMakeLists.txt b/packages/rol/adapters/pebbl/src/CMakeLists.txt
+index 3a5b9d9b..286192ce 100644
+--- a/packages/rol/adapters/pebbl/src/CMakeLists.txt
++++ b/packages/rol/adapters/pebbl/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ IF (ROL_ENABLE_pebbl)
+ )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/sacado/src/CMakeLists.txt b/packages/rol/adapters/sacado/src/CMakeLists.txt
+index 569e9cc9..a7a9ac90 100644
+--- a/packages/rol/adapters/sacado/src/CMakeLists.txt
++++ b/packages/rol/adapters/sacado/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ IF (ROL_ENABLE_Sacado)
+
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/teuchos/src/CMakeLists.txt b/packages/rol/adapters/teuchos/src/CMakeLists.txt
+index f1b4114f..b16e8c8d 100644
+--- a/packages/rol/adapters/teuchos/src/CMakeLists.txt
++++ b/packages/rol/adapters/teuchos/src/CMakeLists.txt
+@@ -49,4 +49,4 @@ IF (ROL_ENABLE_Teuchos)
+ ENDIF()
+
+
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/thyra/src/CMakeLists.txt b/packages/rol/adapters/thyra/src/CMakeLists.txt
+index b10d3814..ed56b725 100644
+--- a/packages/rol/adapters/thyra/src/CMakeLists.txt
++++ b/packages/rol/adapters/thyra/src/CMakeLists.txt
+@@ -42,4 +42,4 @@ IF (ROL_ENABLE_Thyra)
+
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/tpetra/src/CMakeLists.txt b/packages/rol/adapters/tpetra/src/CMakeLists.txt
+index f3bf831d..5d8c7fa6 100644
+--- a/packages/rol/adapters/tpetra/src/CMakeLists.txt
++++ b/packages/rol/adapters/tpetra/src/CMakeLists.txt
+@@ -51,4 +51,4 @@ IF (ROL_ENABLE_Tpetra)
+
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/trikota/src/CMakeLists.txt b/packages/rol/adapters/trikota/src/CMakeLists.txt
+index f55d957b..31cd3b71 100644
+--- a/packages/rol/adapters/trikota/src/CMakeLists.txt
++++ b/packages/rol/adapters/trikota/src/CMakeLists.txt
+@@ -50,4 +50,4 @@ IF (ROL_ENABLE_TriKota)
+ # )
+ ENDIF()
+
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/seacas/applications/explore/CMakeLists.txt b/packages/seacas/applications/explore/CMakeLists.txt
+index b4ca4306..a43fd11c 100644
+--- a/packages/seacas/applications/explore/CMakeLists.txt
++++ b/packages/seacas/applications/explore/CMakeLists.txt
+@@ -23,7 +23,7 @@ TRIBITS_ADD_EXECUTABLE(
+ )
+
+ if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj")
+-InstallSymLink(explore ${CMAKE_INSTALL_PREFIX}/bin/grope)
++InstallSymLink(explore bin/grope)
+ endif()
+
+ install_executable(explore)
+diff --git a/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt b/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt
+index d967154d..987e2071 100644
+--- a/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt
++++ b/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt
+@@ -25,7 +25,7 @@ if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj")
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/exo_jack_32.c
+ )
+ set_target_properties(exoIIv2for32_static PROPERTIES OUTPUT_NAME exoIIv2for32)
+- INSTALL(TARGETS exoIIv2for32_static DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
++ INSTALL(TARGETS exoIIv2for32_static DESTINATION lib)
+ endif()
+ endif()
+
+diff --git a/packages/seacas/libraries/exodus/CMakeLists.txt b/packages/seacas/libraries/exodus/CMakeLists.txt
+index ee13b3a8..03d20fa5 100644
+--- a/packages/seacas/libraries/exodus/CMakeLists.txt
++++ b/packages/seacas/libraries/exodus/CMakeLists.txt
+@@ -47,12 +47,12 @@ if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj")
+ ${SOURCES} ${DEP_SOURCES}
+ )
+ set_target_properties(exodus_static PROPERTIES OUTPUT_NAME exodus)
+- INSTALL(TARGETS exodus_static DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
++ INSTALL(TARGETS exodus_static DESTINATION lib)
+ endif(BUILD_SHARED_LIBS)
+
+ # For backwards compatibility, the C exodus library was called libexoIIv2c.a
+ # Create a symbolic link from libexodus.a to libexoIIv2c.a -- do only for static lib
+- InstallSymLink(libexodus.a ${CMAKE_INSTALL_PREFIX}/lib/libexoIIv2c.a)
++ InstallSymLink(libexodus.a lib/libexoIIv2c.a)
+
+ # add a target to generate API documentation with Doxygen
+ if(SEACASProj_ENABLE_DOXYGEN)
+diff --git a/packages/seacas/libraries/exodus_for/CMakeLists.txt b/packages/seacas/libraries/exodus_for/CMakeLists.txt
+index a1a57385..78d9dea0 100644
+--- a/packages/seacas/libraries/exodus_for/CMakeLists.txt
++++ b/packages/seacas/libraries/exodus_for/CMakeLists.txt
+@@ -29,12 +29,12 @@ if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj")
+ ${SOURCES}
+ )
+ set_target_properties(exodus_for_static PROPERTIES OUTPUT_NAME exodus_for)
+- INSTALL(TARGETS exodus_for_static DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
++ INSTALL(TARGETS exodus_for_static DESTINATION lib)
+ endif()
+
+ # For backwards compatibility, the Fortran exodus library was called libexoIIv2for.a
+ # Create a symbolic link from libexodus_for.a to libexoIIv2for.a -- do only for static lib
+- InstallSymLink(libexodus_for.a ${CMAKE_INSTALL_PREFIX}/lib/libexoIIv2for.a)
++ InstallSymLink(libexodus_for.a lib/libexoIIv2for.a)
+ endif()
+
+ TRIBITS_ADD_TEST_DIRECTORIES(test)
+diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/CMakeLists.txt b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/CMakeLists.txt
+index f4704d35..20920be8 100644
+--- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/CMakeLists.txt
++++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/CMakeLists.txt
+@@ -23,11 +23,11 @@ endif()
+
+ SET(CMAKE_SKIP_BUILD_RPATH FALSE)
+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" ${PARAVIEW_PYTHON_LIBRARY_RPATH_DIRECTORY})
++SET(CMAKE_INSTALL_RPATH "lib" ${PARAVIEW_PYTHON_LIBRARY_RPATH_DIRECTORY})
+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
++LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "lib" isSystemDir)
+ IF("${isSystemDir}" STREQUAL "-1")
+- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
++ SET(CMAKE_INSTALL_RPATH "lib")
+ ENDIF("${isSystemDir}" STREQUAL "-1")
+
+ include_directories("include")
+diff --git a/packages/shylu/shylu_dd/bddc/src/CMakeLists.txt b/packages/shylu/shylu_dd/bddc/src/CMakeLists.txt
+index 23d9916e..a02af7cf 100644
+--- a/packages/shylu/shylu_dd/bddc/src/CMakeLists.txt
++++ b/packages/shylu/shylu_dd/bddc/src/CMakeLists.txt
+@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+diff --git a/packages/shylu/shylu_node/basker/src/CMakeLists.txt b/packages/shylu/shylu_node/basker/src/CMakeLists.txt
+index 1f3f6b28..a189f785 100644
+--- a/packages/shylu/shylu_node/basker/src/CMakeLists.txt
++++ b/packages/shylu/shylu_node/basker/src/CMakeLists.txt
+@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+diff --git a/packages/shylu/shylu_node/fastilu/src/CMakeLists.txt b/packages/shylu/shylu_node/fastilu/src/CMakeLists.txt
+index b6bd0e74..d959a9f0 100644
+--- a/packages/shylu/shylu_node/fastilu/src/CMakeLists.txt
++++ b/packages/shylu/shylu_node/fastilu/src/CMakeLists.txt
+@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+diff --git a/packages/shylu/shylu_node/hts/src/CMakeLists.txt b/packages/shylu/shylu_node/hts/src/CMakeLists.txt
+index 2fe54263..2ba575c3 100644
+--- a/packages/shylu/shylu_node/hts/src/CMakeLists.txt
++++ b/packages/shylu/shylu_node/hts/src/CMakeLists.txt
+@@ -19,7 +19,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ SET(SOURCES shylu_hts.cpp)
+ SET(HEADERS_PUBLIC shylu_hts.hpp shylu_hts_decl.hpp shylu_hts_impl.hpp shylu_hts_impl_def.hpp)
+diff --git a/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2015/src/CMakeLists.txt b/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2015/src/CMakeLists.txt
+index 06c97a40..54561e2d 100644
+--- a/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2015/src/CMakeLists.txt
++++ b/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2015/src/CMakeLists.txt
+@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+diff --git a/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2016/src/CMakeLists.txt b/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2016/src/CMakeLists.txt
+index 61192d2c..739cbab2 100644
+--- a/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2016/src/CMakeLists.txt
++++ b/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2016/src/CMakeLists.txt
+@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+diff --git a/packages/shylu/shylu_node/tacho/src/CMakeLists.txt b/packages/shylu/shylu_node/tacho/src/CMakeLists.txt
+index 7e140d8b..6f701c40 100644
+--- a/packages/shylu/shylu_node/tacho/src/CMakeLists.txt
++++ b/packages/shylu/shylu_node/tacho/src/CMakeLists.txt
+@@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ #-----------------------------------------------------------------------------
+
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ #-----------------------------------------------------------------------------
+
+diff --git a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
+index e4b45031..4cb823f9 100644
+--- a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
+@@ -21,5 +21,5 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
+
+diff --git a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
+index ef47a267..9bef4bec 100644
+--- a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
+@@ -46,4 +46,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
+diff --git a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
+index cf6032d3..e23213f9 100644
+--- a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
+@@ -49,7 +49,7 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ 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 --git a/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
+index e5befd0d..a5e991e7 100644
+--- a/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
+@@ -45,4 +45,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
+diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
+index fc50a5b0..751e1f69 100644
+--- a/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
+@@ -54,7 +54,7 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ 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 --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
+index 54ef03ed..90ac4e04 100644
+--- a/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
+@@ -48,5 +48,5 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
+
+diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+index 18e8e081..283784d5 100644
+--- a/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+@@ -54,4 +54,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
+diff --git a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
+index 9a6f4cc1..f530589d 100644
+--- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
+@@ -46,4 +46,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
+diff --git a/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt b/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
+index e13d37cd..f1ad5584 100644
+--- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
+@@ -18,4 +18,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
+diff --git a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
+index 62e9b601..7fc256a1 100644
+--- a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
+@@ -62,4 +62,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+diff --git a/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt b/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
+index 63d60b9f..cd0ea2bf 100644
+--- a/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
+@@ -34,5 +34,5 @@ ENDIF()
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
+
+diff --git a/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt b/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
+index 925daf5c..ddb06097 100644
+--- a/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
+@@ -54,4 +54,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ #INSTALL(FILES ${HEADERS} DESTINATION
+-# ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
++# ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+diff --git a/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
+index 4a91d34e..c00793d5 100644
+--- a/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
+@@ -16,6 +16,6 @@ ENDIF()
+ 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 --git a/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
+index 2c0dea4e..51d0013e 100644
+--- a/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
+@@ -82,5 +82,5 @@ TRIBITS_ADD_LIBRARY(
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
+
+diff --git a/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
+index 93fc5a94..ccb9f10c 100644
+--- a/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
+@@ -80,4 +80,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
+diff --git a/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
+index 1640ef50..65d39479 100644
+--- a/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
+@@ -61,4 +61,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
+diff --git a/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
+index 769bd69f..9ea0e079 100644
+--- a/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
+@@ -50,4 +50,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ 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 --git a/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
+index 4585b226..b5be334b 100644
+--- a/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
+@@ -49,4 +49,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ #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 --git a/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
+index b49c92e7..32aaaf0b 100644
+--- a/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
+@@ -46,4 +46,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
+diff --git a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
+index 66e4eb87..502858f4 100644
+--- a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
++++ b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
+@@ -77,4 +77,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
+diff --git a/packages/stk/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_io/stk_io/CMakeLists.txt
+index eac6ed04..05b65b69 100644
+--- a/packages/stk/stk_io/stk_io/CMakeLists.txt
++++ b/packages/stk/stk_io/stk_io/CMakeLists.txt
+@@ -78,7 +78,7 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ 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 --git a/packages/stk/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_io/stk_io/util/CMakeLists.txt
+index 687821fb..4c25d53b 100644
+--- a/packages/stk/stk_io/stk_io/util/CMakeLists.txt
++++ b/packages/stk/stk_io/stk_io/util/CMakeLists.txt
+@@ -76,4 +76,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
+diff --git a/packages/stk/stk_math/stk_math/CMakeLists.txt b/packages/stk/stk_math/stk_math/CMakeLists.txt
+index 02f9a03b..b1b37886 100644
+--- a/packages/stk/stk_math/stk_math/CMakeLists.txt
++++ b/packages/stk/stk_math/stk_math/CMakeLists.txt
+@@ -69,4 +69,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_math)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_math)
+diff --git a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
+index 67bab20c..5523be60 100644
+--- a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
++++ b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
+@@ -84,14 +84,14 @@ TRIBITS_ADD_LIBRARY(
+ 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 --git a/packages/stk/stk_ngp/stk_ngp/CMakeLists.txt b/packages/stk/stk_ngp/stk_ngp/CMakeLists.txt
+index 69f80d2f..0ae44d17 100644
+--- a/packages/stk/stk_ngp/stk_ngp/CMakeLists.txt
++++ b/packages/stk/stk_ngp/stk_ngp/CMakeLists.txt
+@@ -77,5 +77,5 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_ngp/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_ngp/)
+
+diff --git a/packages/stk/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_search/stk_search/CMakeLists.txt
+index ae6cc042..199c82f3 100644
+--- a/packages/stk/stk_search/stk_search/CMakeLists.txt
++++ b/packages/stk/stk_search/stk_search/CMakeLists.txt
+@@ -69,4 +69,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+diff --git a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
+index ca6e439b..dd460d43 100644
+--- a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
++++ b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
+@@ -68,5 +68,5 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
+
+diff --git a/packages/stk/stk_simd/stk_math/CMakeLists.txt b/packages/stk/stk_simd/stk_math/CMakeLists.txt
+index 2c5028c1..7c1ba46f 100644
+--- a/packages/stk/stk_simd/stk_math/CMakeLists.txt
++++ b/packages/stk/stk_simd/stk_math/CMakeLists.txt
+@@ -64,5 +64,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_math)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_math)
+
+diff --git a/packages/stk/stk_simd/stk_simd/CMakeLists.txt b/packages/stk/stk_simd/stk_simd/CMakeLists.txt
+index 68dee725..9c987fe5 100644
+--- a/packages/stk/stk_simd/stk_simd/CMakeLists.txt
++++ b/packages/stk/stk_simd/stk_simd/CMakeLists.txt
+@@ -69,5 +69,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/)
+
+diff --git a/packages/stk/stk_simd/stk_simd/avx/CMakeLists.txt b/packages/stk/stk_simd/stk_simd/avx/CMakeLists.txt
+index 1cf5b6ae..b06b0000 100644
+--- a/packages/stk/stk_simd/stk_simd/avx/CMakeLists.txt
++++ b/packages/stk/stk_simd/stk_simd/avx/CMakeLists.txt
+@@ -64,5 +64,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/avx)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/avx)
+
+diff --git a/packages/stk/stk_simd/stk_simd/avx512/CMakeLists.txt b/packages/stk/stk_simd/stk_simd/avx512/CMakeLists.txt
+index adc5405c..db59bce6 100644
+--- a/packages/stk/stk_simd/stk_simd/avx512/CMakeLists.txt
++++ b/packages/stk/stk_simd/stk_simd/avx512/CMakeLists.txt
+@@ -64,5 +64,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/avx512)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/avx512)
+
+diff --git a/packages/stk/stk_simd/stk_simd/no_simd/CMakeLists.txt b/packages/stk/stk_simd/stk_simd/no_simd/CMakeLists.txt
+index 7baf7094..66529920 100644
+--- a/packages/stk/stk_simd/stk_simd/no_simd/CMakeLists.txt
++++ b/packages/stk/stk_simd/stk_simd/no_simd/CMakeLists.txt
+@@ -64,5 +64,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/no_simd)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/no_simd)
+
+diff --git a/packages/stk/stk_simd/stk_simd/sse/CMakeLists.txt b/packages/stk/stk_simd/stk_simd/sse/CMakeLists.txt
+index 970cbc6c..31d209df 100644
+--- a/packages/stk/stk_simd/stk_simd/sse/CMakeLists.txt
++++ b/packages/stk/stk_simd/stk_simd/sse/CMakeLists.txt
+@@ -64,5 +64,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/sse)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/sse)
+
+diff --git a/packages/stk/stk_simd/stk_simd_view/CMakeLists.txt b/packages/stk/stk_simd/stk_simd_view/CMakeLists.txt
+index b1b5c343..0849bbde 100644
+--- a/packages/stk/stk_simd/stk_simd_view/CMakeLists.txt
++++ b/packages/stk/stk_simd/stk_simd_view/CMakeLists.txt
+@@ -64,5 +64,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd_view)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd_view)
+
+diff --git a/packages/stk/stk_tools/stk_tools/CMakeLists.txt b/packages/stk/stk_tools/stk_tools/CMakeLists.txt
+index 4a540bf6..c0ec799d 100644
+--- a/packages/stk/stk_tools/stk_tools/CMakeLists.txt
++++ b/packages/stk/stk_tools/stk_tools/CMakeLists.txt
+@@ -68,10 +68,10 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${MESH_CLONE_HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_tools/mesh_clone)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_tools/mesh_clone)
+
+ INSTALL(FILES ${BLOCK_EXTRACTOR_HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_tools/block_extractor)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_tools/block_extractor)
+
+ #
+ #Disabling due to undefined reference to `stk::parallel::require(bool, std::string const&, ompi_communicator_t*)'
+diff --git a/packages/stk/stk_topology/stk_topology/CMakeLists.txt b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
+index 6898eeae..66624592 100644
+--- a/packages/stk/stk_topology/stk_topology/CMakeLists.txt
++++ b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
+@@ -71,7 +71,7 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ 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 --git a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
+index e9d96efe..d2fbc2d4 100644
+--- a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
++++ b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
+@@ -5,7 +5,7 @@
+ 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/)
+
+ FILE(GLOB HEADERS_IMPL ${CMAKE_CURRENT_SOURCE_DIR}/copy_by_id/*.hpp)
+ FILE(GLOB SOURCES_IMPL ${CMAKE_CURRENT_SOURCE_DIR}/copy_by_id/*.cpp)
+diff --git a/packages/stk/stk_unit_test_utils/CMakeLists.txt b/packages/stk/stk_unit_test_utils/CMakeLists.txt
+index 91d65277..c5954a00 100644
+--- a/packages/stk/stk_unit_test_utils/CMakeLists.txt
++++ b/packages/stk/stk_unit_test_utils/CMakeLists.txt
+@@ -12,7 +12,7 @@ FILE(GLOB SOURCES *.cpp)
+ LIST(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/unittestMeshUtils.cpp")
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_unit_test_utils/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_unit_test_utils/)
+
+ TRIBITS_ADD_LIBRARY(
+ stk_unit_test_utils
+diff --git a/packages/stk/stk_unit_test_utils/comparison/CMakeLists.txt b/packages/stk/stk_unit_test_utils/comparison/CMakeLists.txt
+index 175fe199..5a1deca6 100644
+--- a/packages/stk/stk_unit_test_utils/comparison/CMakeLists.txt
++++ b/packages/stk/stk_unit_test_utils/comparison/CMakeLists.txt
+@@ -64,5 +64,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_unit_test_utils/comparison)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_unit_test_utils/comparison)
+
+diff --git a/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt
+index 650aa7da..e21cff44 100644
+--- a/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt
++++ b/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt
+@@ -71,4 +71,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_unit_tests/stk_mesh_fixtures)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_unit_tests/stk_mesh_fixtures)
+diff --git a/packages/stk/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_util/stk_util/CMakeLists.txt
+index 23769cfc..af435ee5 100644
+--- a/packages/stk/stk_util/stk_util/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/CMakeLists.txt
+@@ -22,6 +22,6 @@ TRIBITS_CONFIGURE_FILE(STK_Trilinos_config.h)
+ 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 --git a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
+index 3a862479..951d714c 100644
+--- a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
+@@ -75,5 +75,5 @@ TRIBITS_ADD_LIBRARY(
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
+
+diff --git a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
+index 50c9e86d..d7387814 100644
+--- a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
+@@ -73,4 +73,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
+diff --git a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
+index b6b46350..912c9c6d 100644
+--- a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
+@@ -90,4 +90,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
+diff --git a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
+index 0708dfce..ec60609d 100644
+--- a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
+@@ -70,5 +70,5 @@ TRIBITS_ADD_LIBRARY(
+
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
+
+diff --git a/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt b/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
+index 6b92b6b1..748d27d9 100644
+--- a/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
+@@ -78,4 +78,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ 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 --git a/packages/stk/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_util/stk_util/util/CMakeLists.txt
+index b90c66bd..05e40b0f 100644
+--- a/packages/stk/stk_util/stk_util/util/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/util/CMakeLists.txt
+@@ -75,4 +75,4 @@ TRIBITS_ADD_LIBRARY(
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
+diff --git a/packages/teuchos/kokkoscompat/src/CMakeLists.txt b/packages/teuchos/kokkoscompat/src/CMakeLists.txt
+index f127249c..1fde480e 100644
+--- a/packages/teuchos/kokkoscompat/src/CMakeLists.txt
++++ b/packages/teuchos/kokkoscompat/src/CMakeLists.txt
+@@ -27,7 +27,7 @@ TRIBITS_ADD_LIBRARY(
+ # 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 --git a/packages/trios/libraries/support/CMakeLists.txt b/packages/trios/libraries/support/CMakeLists.txt
+index 3b8c4fd8..175f736e 100644
+--- a/packages/trios/libraries/support/CMakeLists.txt
++++ b/packages/trios/libraries/support/CMakeLists.txt
+@@ -168,6 +168,6 @@ TRIBITS_ADD_LIBRARY(
+
+ ########### install targets ###############
+
+-# INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
++# INSTALL(FILES ${MODULES} DESTINATION include)
+
+ TRIBITS_SUBPACKAGE_POSTPROCESS()
+diff --git a/packages/zoltan/src/CMakeLists.txt b/packages/zoltan/src/CMakeLists.txt
+index 84f1e824..10a8a893 100644
+--- a/packages/zoltan/src/CMakeLists.txt
++++ b/packages/zoltan/src/CMakeLists.txt
+@@ -681,5 +681,5 @@ TRIBITS_ADD_LIBRARY(
+ IMPORTEDLIBS ${IMPORTEDLIBS}
+ )
+
+-INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
++INSTALL(FILES ${MODULES} DESTINATION include)
+
+diff --git a/packages/zoltan/src/fdriver/CMakeLists.txt b/packages/zoltan/src/fdriver/CMakeLists.txt
+index 32913f39..8dd9cba6 100644
+--- a/packages/zoltan/src/fdriver/CMakeLists.txt
++++ b/packages/zoltan/src/fdriver/CMakeLists.txt
+@@ -33,6 +33,6 @@ IF(${PROJECT_NAME}_ENABLE_Fortran AND BUILD_ZOLTAN_F90_INTERFACE)
+
+ # 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.12.1-r1.ebuild b/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
index 432977e10..d5846614c 100644
--- a/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
@@ -61,7 +61,7 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${P}-Source"
PATCHES=(
- "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
+ "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch
"${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch
"${FILESDIR}"/${P}-fix_sundance_compilation.patch
"${FILESDIR}"/${P}-superlu-5.patch
diff --git a/sci-libs/trilinos/trilinos-12.14.1.ebuild b/sci-libs/trilinos/trilinos-12.14.1.ebuild
new file mode 100644
index 000000000..efe37db93
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-12.14.1.ebuild
@@ -0,0 +1,206 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils toolchain-funcs multilib toolchain-funcs
+
+DESCRIPTION="Scientific library collection for large scale problems"
+HOMEPAGE="http://trilinos.sandia.gov/"
+MY_PV=${PV//\./-}
+SRC_URI="https://github.com/${PN}/Trilinos/archive/${PN}-release-${MY_PV}.tar.gz -> ${P}.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 scalapack scotch sparse
+ superlu taucs tbb test threads tvmet yaml zlib X
+"
+
+# 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 )
+ 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 )
+ X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch
+ "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch
+)
+
+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}" )
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"
+ -DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
+ -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
+ -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
+ -DTrilinos_ENABLE_ALL_PACKAGES=ON
+ -DTrilinos_ENABLE_CTrilinos=OFF
+ -DTrilinos_ENABLE_PyTrilinos=OFF
+ -DTrilinos_ENABLE_SEACASExodiff="$(usex netcdf)"
+ -DTrilinos_ENABLE_SEACASExodus="$(usex netcdf)"
+ -DTrilinos_ENABLE_TESTS="$(usex test)"
+ -DZoltan2_ENABLE_Experimental=ON
+ -DTPL_ENABLE_BinUtils=ON
+ -DTPL_ENABLE_BLAS=ON
+ -DTPL_ENABLE_LAPACK=ON
+ -DTPL_ENABLE_MPI=ON
+ -DTPL_ENABLE_ADOLC="$(usex adolc)"
+ -DTPL_ENABLE_AMD="$(usex sparse)"
+ -DTPL_ENABLE_ARPREC="$(usex arprec)"
+ -DTPL_ENABLE_BLACS="$(usex scalapack)"
+ -DTPL_ENABLE_BoostLib="$(usex boost)"
+ -DTPL_ENABLE_Boost="$(usex boost)"
+ -DTPL_ENABLE_Clp="$(usex clp)"
+ -DTPL_ENABLE_Cppunit="$(usex cppunit)"
+ -DTPL_ENABLE_CSparse="$(usex sparse)"
+ -DTPL_ENABLE_CUDA="$(usex cuda)"
+ -DTPL_ENABLE_CUSPARSE="$(usex cuda)"
+ -DTPL_ENABLE_Eigen="$(usex eigen)"
+ -DTPL_ENABLE_GLPK="$(usex glpk)"
+ -DTPL_ENABLE_gtest="$(usex gtest)"
+ -DTPL_ENABLE_HDF5="$(usex hdf5)"
+ -DTPL_ENABLE_HWLOC="$(usex hwloc)"
+ -DTPL_ENABLE_HYPRE="$(usex hypre)"
+ -DTPL_ENABLE_Matio="$(usex matio)"
+ -DTPL_ENABLE_METIS="$(usex metis)"
+ -DTPL_ENABLE_MKL="$(usex mkl)"
+ -DTPL_ENABLE_MUMPS="$(usex mumps)"
+ -DTPL_ENABLE_Netcdf="$(usex netcdf)"
+ -DTPL_ENABLE_PARDISO_MKL="$(usex mkl)"
+ -DTPL_ENABLE_PETSC="$(usex petsc)"
+ -DTPL_ENABLE_Pthread="$(usex threads)"
+ -DTPL_ENABLE_QD="$(usex qd)"
+ -DTPL_ENABLE_SCALAPACK="$(usex scalapack)"
+ -DTPL_ENABLE_Scotch="$(usex scotch)"
+ -DTPL_ENABLE_SuperLU="$(usex superlu)"
+ -DTPL_ENABLE_TAUCS="$(usex taucs)"
+ -DTPL_ENABLE_TBB="$(usex tbb)"
+ -DTPL_ENABLE_Thrust="$(usex cuda)"
+ -DTPL_ENABLE_TVMET="$(usex tvmet)"
+ -DTPL_ENABLE_UMFPACK="$(usex sparse)"
+ -DTPL_ENABLE_X11="$(usex X)"
+ -DTPL_ENABLE_yaml-cpp="$(usex yaml)"
+ -DTPL_ENABLE_Zlib="$(usex zlib)"
+ -DML_ENABLE_SuperLU:BOOL=OFF
+ )
+
+ 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
+
+ #
+ # Make sure we use the compiler wrappers in order to build trilinos.
+ #
+ 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
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # Clean up the mess:
+ rm -r "${ED}"/TrilinosRepoVersion.txt "${ED}"/lib || die "rm failed"
+ mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed"
+
+ #
+ # 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"
+ PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin"
+ EOF
+ doenvd "${T}"/99trilinos
+}