[gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/

Matthias Maier Sun, 04 Aug 2019 23:53:01 -0700

commit:     998f2a2c3f236879ea713a3cf1576d014be15e5c
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  5 06:43:45 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Aug  5 06:43:45 2019 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=998f2a2c


sci-libs/trilinos: merge into ::gentoo and remove from overlay.

Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 .../files/trilinos-11.14.1-fix-install-paths.patch |   61 --
 ...nos-12.12.1-fix_install_paths_for_destdir.patch | 1069 --------------------
 ...trilinos-12.12.1-fix_sundance_compilation.patch |   33 -
 .../files/trilinos-12.12.1-superlu-5.patch         |  161 ---
 ...nos-12.14.1-fix_install_paths_for_destdir.patch |  973 ------------------
 sci-libs/trilinos/metadata.xml                     |   51 -
 sci-libs/trilinos/trilinos-12.12.1-r1.ebuild       |  206 ----
 sci-libs/trilinos/trilinos-12.14.1.ebuild          |  207 ----
 8 files changed, 2761 deletions(-)

diff --git a/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch 
b/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
deleted file mode 100644
index 32f25f326..000000000
--- a/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff --git a/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake 
b/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake
-index e1c633f..864488f 100644
---- a/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
-+++ b/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
-@@ -494,8 +494,8 @@ 
INCLUDE(\"${PROJECT_BINARY_DIR}/${PACKAGE_NAME}Targets.cmake\")"
-   FOREACH(PATH ${PATH_LIST})
-     SET(RELATIVE_PATH "${RELATIVE_PATH}/..")
-   ENDFOREACH()
--  SET(FULL_LIBRARY_DIRS_SET 
"\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_LIB_DIR}")
--  SET(FULL_INCLUDE_DIRS_SET 
"\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
-+  SET(FULL_LIBRARY_DIRS_SET "${${PROJECT_NAME}_INSTALL_LIB_DIR}")
-+  SET(FULL_INCLUDE_DIRS_SET "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
- 
-   # Custom code in configuration file.
-   SET(PACKAGE_CONFIG_CODE "")
-@@ -574,14 +574,14 @@ 
FUNCTION(TRIBITS_WRITE_PROJECT_CLIENT_EXPORT_FILES_INSTALL_TARGETS PACKAGE_NAME)
-   IF (${PROJECT_NAME}_ENABLE_INSTALL_CMAKE_CONFIG_FILES)
-     INSTALL(
-       FILES 
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PACKAGE_NAME}Config_install.cmake
--      DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}"
-+      DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}"
-       RENAME ${PACKAGE_NAME}Config.cmake
-       )
- 
-     IF(${PACKAGE_NAME}_HAS_NATIVE_LIBRARIES)
-       INSTALL(
-         EXPORT ${PACKAGE_NAME}
--        DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}"
-+        DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}"
-         FILE ${PACKAGE_NAME}Targets.cmake
-         )
-     ENDIF()
-@@ -819,8 +819,8 @@ 
include(\"${${TRIBITS_PACKAGE}_BINARY_DIR}/${TRIBITS_PACKAGE}Config.cmake\")")
-   FOREACH(PATH ${PATH_LIST})
-     SET(RELATIVE_PATH "${RELATIVE_PATH}/..")
-   ENDFOREACH()
--  SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS 
"\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
--  SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS 
"\${CMAKE_CURRENT_LIST_DIR}/${RELATIVE_PATH}/${${PROJECT_NAME}_INSTALL_LIB_DIR}")
-+  SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS 
"${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
-+  SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS 
"${${PROJECT_NAME}_INSTALL_LIB_DIR}")
- 
-   # Write the specification of the rpath if necessary. This is only needed if 
we're building shared libraries.
-   IF(BUILD_SHARED_LIBS)
-@@ -845,7 +845,7 @@ 
include(\"\${CMAKE_CURRENT_LIST_DIR}/../${TRIBITS_PACKAGE}/${TRIBITS_PACKAGE}Con
- 
-     INSTALL(
-       FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config_install.cmake
--      DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
-+      DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
-       RENAME ${PROJECT_NAME}Config.cmake
-       )
-   ENDIF()
-@@ -890,7 +890,7 @@ 
include(\"\${CMAKE_CURRENT_LIST_DIR}/../${TRIBITS_PACKAGE}/${TRIBITS_PACKAGE}Con
-     )
-   INSTALL(
-     FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
--    DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
-+    DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
-     )
- 
- ENDFUNCTION()

diff --git 
a/sci-libs/trilinos/files/trilinos-12.12.1-fix_install_paths_for_destdir.patch 
b/sci-libs/trilinos/files/trilinos-12.12.1-fix_install_paths_for_destdir.patch
deleted file mode 100644
index d4e04a438..000000000
--- 
a/sci-libs/trilinos/files/trilinos-12.12.1-fix_install_paths_for_destdir.patch
+++ /dev/null
@@ -1,1069 +0,0 @@
-diff --git a/commonTools/gtest/CMakeLists.txt 
b/commonTools/gtest/CMakeLists.txt
-index 4b96030..34aef5f 100644
---- a/commonTools/gtest/CMakeLists.txt
-+++ b/commonTools/gtest/CMakeLists.txt
-@@ -36,7 +36,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/)
- 
- 
- 
-diff --git a/packages/rol/adapters/arrayfire/src/CMakeLists.txt 
b/packages/rol/adapters/arrayfire/src/CMakeLists.txt
-index 2c6b4b0..6184d3d 100644
---- a/packages/rol/adapters/arrayfire/src/CMakeLists.txt
-+++ b/packages/rol/adapters/arrayfire/src/CMakeLists.txt
-@@ -36,4 +36,4 @@ IF (ROL_ENABLE_ArrayFireCPU)
-  )
- 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 109f28e..3749b75 100644
---- a/packages/rol/adapters/belos/src/CMakeLists.txt
-+++ b/packages/rol/adapters/belos/src/CMakeLists.txt
-@@ -39,4 +39,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/epetra/src/CMakeLists.txt 
b/packages/rol/adapters/epetra/src/CMakeLists.txt
-index f2b329b..d96b18d 100644
---- a/packages/rol/adapters/epetra/src/CMakeLists.txt
-+++ b/packages/rol/adapters/epetra/src/CMakeLists.txt
-@@ -42,4 +42,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 0da2642..d91a4a7 100644
---- a/packages/rol/adapters/minitensor/src/CMakeLists.txt
-+++ b/packages/rol/adapters/minitensor/src/CMakeLists.txt
-@@ -67,4 +67,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/sacado/src/CMakeLists.txt 
b/packages/rol/adapters/sacado/src/CMakeLists.txt
-index 1ac1a19..a808d63 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 802760c..34aae17 100644
---- a/packages/rol/adapters/teuchos/src/CMakeLists.txt
-+++ b/packages/rol/adapters/teuchos/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/thyra/src/CMakeLists.txt 
b/packages/rol/adapters/thyra/src/CMakeLists.txt
-index 725cad8..357e799 100644
---- a/packages/rol/adapters/thyra/src/CMakeLists.txt
-+++ b/packages/rol/adapters/thyra/src/CMakeLists.txt
-@@ -49,4 +49,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 1367681..65d0cb3 100644
---- a/packages/rol/adapters/tpetra/src/CMakeLists.txt
-+++ b/packages/rol/adapters/tpetra/src/CMakeLists.txt
-@@ -46,4 +46,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 37d3c0e..bca4b82 100644
---- a/packages/rol/adapters/trikota/src/CMakeLists.txt
-+++ b/packages/rol/adapters/trikota/src/CMakeLists.txt
-@@ -45,4 +45,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/libraries/exoIIv2for32/CMakeLists.txt 
b/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt
-index d967154..987e207 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 b0fcc59..69aca93 100644
---- a/packages/seacas/libraries/exodus/CMakeLists.txt
-+++ b/packages/seacas/libraries/exodus/CMakeLists.txt
-@@ -47,7 +47,7 @@ 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 compatability, the C exodus library was called 
libexoIIv2c.a
-diff --git a/packages/seacas/libraries/exodus_for/CMakeLists.txt 
b/packages/seacas/libraries/exodus_for/CMakeLists.txt
-index 3b9d270..5660c72 100644
---- a/packages/seacas/libraries/exodus_for/CMakeLists.txt
-+++ b/packages/seacas/libraries/exodus_for/CMakeLists.txt
-@@ -29,7 +29,7 @@ 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 compatability, the Fortran exodus library was called 
libexoIIv2for.a
-diff --git a/packages/trios/libraries/support/CMakeLists.txt 
b/packages/trios/libraries/support/CMakeLists.txt
-index 3b8c4fd..175f736 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 84f1e82..10a8a89 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 32913f3..8dd9cba 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/packages/ForTrilinos/docs/CMakeLists.txt 
b/packages/ForTrilinos/docs/CMakeLists.txt
-index 0ea4b83..a4b2aae 100644
---- a/packages/ForTrilinos/docs/CMakeLists.txt
-+++ b/packages/ForTrilinos/docs/CMakeLists.txt
-@@ -9,5 +9,5 @@ ADD_CUSTOM_TARGET(docs ALL
- )
- 
- INSTALL(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/html"
--    DESTINATION "${CMAKE_INSTALL_PREFIX}/docs"
-+    DESTINATION " docs"
- )
-diff --git a/packages/kokkos-kernels/src/CMakeLists.txt 
b/packages/kokkos-kernels/src/CMakeLists.txt
-index 8db1b51..78deb76 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/cmake/kokkos.cmake 
b/packages/kokkos/cmake/kokkos.cmake
-index 235b7ea..52477cb 100644
---- a/packages/kokkos/cmake/kokkos.cmake
-+++ b/packages/kokkos/cmake/kokkos.cmake
-@@ -985,14 +985,6 @@ ENDIF()
- SET(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH
-     "Installation directory for CMake files")
- 
--# Make relative paths absolute (needed later on)
--FOREACH(p LIB BIN INCLUDE CMAKE)
--  SET(var INSTALL_${p}_DIR)
--  IF(NOT IS_ABSOLUTE "${${var}}")
--    SET(${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
--  ENDIF()
--ENDFOREACH()
--
- # set up include-directories
- SET (Kokkos_INCLUDE_DIRS
-     ${Kokkos_SOURCE_DIR}/core/src
-@@ -1022,9 +1014,9 @@ IF(KOKKOS_SEPARATE_LIBS)
- 
-   # Install the kokkoscore library
-   INSTALL (TARGETS kokkoscore
--           ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
--           LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
--           RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-+    ARCHIVE DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}
-+    LIBRARY DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}
-+    RUNTIME DESTINATION bin
-   )
- 
-   # Install the kokkoscore headers
-@@ -1059,9 +1051,10 @@ IF(KOKKOS_SEPARATE_LIBS)
- 
-   # Install the kokkocontainers library
-   INSTALL (TARGETS kokkoscontainers
--           ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
--           LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
--           RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-+    ARCHIVE DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}
-+    LIBRARY DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}
-+    RUNTIME DESTINATION bin
-+    )
- 
-   # Install the kokkoscontainers headers
-   INSTALL (DIRECTORY
-@@ -1088,9 +1081,10 @@ IF(KOKKOS_SEPARATE_LIBS)
- 
-   # Install the kokkoalgorithms library
-   INSTALL (TARGETS kokkosalgorithms
--           ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
--           LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
--           RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-+    ARCHIVE DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}
-+    LIBRARY DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}
-+    RUNTIME DESTINATION bin
-+    )
- 
-   # Install the kokkosalgorithms headers
-   INSTALL (DIRECTORY
-@@ -1128,9 +1122,10 @@ ELSE()
-   # Install the kokkos library
-   INSTALL (TARGETS kokkos
-            EXPORT KokkosTargets
--           ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
--           LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
--           RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-+    ARCHIVE DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}
-+    LIBRARY DESTINATION ${${PROJECT_NAME}_INSTALL_LIB_DIR}
-+    RUNTIME DESTINATION bin
-+    )
- 
- 
-   # Install the kokkos headers
-diff --git a/packages/kokkos/containers/src/CMakeLists.txt 
b/packages/kokkos/containers/src/CMakeLists.txt
-index da5a791..65a7c76 100644
---- a/packages/kokkos/containers/src/CMakeLists.txt
-+++ b/packages/kokkos/containers/src/CMakeLists.txt
-@@ -15,7 +15,7 @@ FILE(GLOB HEADERS *.hpp)
- 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 --git a/packages/kokkos/core/src/CMakeLists.txt 
b/packages/kokkos/core/src/CMakeLists.txt
-index 492470d..3c8eeea 100644
---- a/packages/kokkos/core/src/CMakeLists.txt
-+++ b/packages/kokkos/core/src/CMakeLists.txt
-@@ -40,7 +40,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 c543194..1021f42 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/seacas/libraries/exodus/CMakeLists.txt 
b/packages/seacas/libraries/exodus/CMakeLists.txt
-index 69aca93..9d80c9c 100644
---- a/packages/seacas/libraries/exodus/CMakeLists.txt
-+++ b/packages/seacas/libraries/exodus/CMakeLists.txt
-@@ -52,7 +52,7 @@ if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj")
- 
-    # For backwards compatability, 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)
- endif()
- 
- TRIBITS_ADD_TEST_DIRECTORIES(test)
-diff --git a/packages/seacas/libraries/exodus_for/CMakeLists.txt 
b/packages/seacas/libraries/exodus_for/CMakeLists.txt
-index 5660c72..f9c0511 100644
---- a/packages/seacas/libraries/exodus_for/CMakeLists.txt
-+++ b/packages/seacas/libraries/exodus_for/CMakeLists.txt
-@@ -34,7 +34,7 @@ if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj")
- 
-   # For backwards compatability, 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 f4704d3..0b4d7c6 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/basker/src/CMakeLists.txt 
b/packages/shylu/basker/src/CMakeLists.txt
-index b52c4a3..671ca7b 100644
---- a/packages/shylu/basker/src/CMakeLists.txt
-+++ b/packages/shylu/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/bddc/src/CMakeLists.txt 
b/packages/shylu/bddc/src/CMakeLists.txt
-index bcb8f2e..bfece1a 100644
---- a/packages/shylu/bddc/src/CMakeLists.txt
-+++ b/packages/shylu/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/fastilu/src/CMakeLists.txt 
b/packages/shylu/fastilu/src/CMakeLists.txt
-index 9ad8846..e226b30 100644
---- a/packages/shylu/fastilu/src/CMakeLists.txt
-+++ b/packages/shylu/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/hts/src/CMakeLists.txt 
b/packages/shylu/hts/src/CMakeLists.txt
-index d8ec572..c7807f8 100644
---- a/packages/shylu/hts/src/CMakeLists.txt
-+++ b/packages/shylu/hts/src/CMakeLists.txt
-@@ -18,7 +18,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/tacho/core/src/CMakeLists.txt 
b/packages/shylu/tacho/core/src/CMakeLists.txt
-index 1e44b1e..b24e994 100644
---- a/packages/shylu/tacho/core/src/CMakeLists.txt
-+++ b/packages/shylu/tacho/core/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/tacho/deprecated/src/CMakeLists.txt 
b/packages/shylu/tacho/deprecated/src/CMakeLists.txt
-index 54ce6d8..7697514 100644
---- a/packages/shylu/tacho/deprecated/src/CMakeLists.txt
-+++ b/packages/shylu/tacho/deprecated/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/tacho/refactor/src/CMakeLists.txt 
b/packages/shylu/tacho/refactor/src/CMakeLists.txt
-index e3dd6d1..83abb98 100644
---- a/packages/shylu/tacho/refactor/src/CMakeLists.txt
-+++ b/packages/shylu/tacho/refactor/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/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt 
b/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
-index 695b21d..4a24142 100644
---- a/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
-@@ -46,7 +46,7 @@ TRIBITS_ADD_LIBRARY(
- )
- 
- 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 --git 
a/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt 
b/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
-index db930be..50fbe8b 100644
---- 
a/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
-+++ 
b/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
-@@ -34,5 +34,5 @@ ENDIF()
- 
- 
- 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 --git a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt 
b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
-index e4b4503..16411f9 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 ef47a26..c83420b 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 cf6032d..2d04b5b 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 e5befd0..da4fac6 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 fc50a5b..cc2cf5b 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 54ef03e..c1d67db 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 18e8e08..f0e2a4d 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_percept/stk_percept/CMakeLists.txt 
b/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
-index 854268d..4357edc 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
-@@ -68,5 +68,5 @@ TRIBITS_ADD_LIBRARY(
- )
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/)
- 
-diff --git 
a/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt 
b/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
-index 10868c3..3fa5425 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/)
-+     ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/)
- 
-diff --git 
a/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt 
b/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
-index a60a1a8..40e0d03 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
-@@ -37,5 +37,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/)
-+     ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/)
- 
-diff --git 
a/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
 
b/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
-index ebea648..698207f 100644
---- 
a/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
-+++ 
b/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
-@@ -36,5 +36,5 @@ ENDIF()
- 
- 
- 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 --git 
a/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt 
b/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
-index 2b256f1..417eebb 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/)
-+     ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/)
- 
-diff --git 
a/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt 
b/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
-index 2acb307..5680bb1 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- 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 --git 
a/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt 
b/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
-index e9c2a8c..9509d0a 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/)
-+     ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/)
- 
-diff --git 
a/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt 
b/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
-index 63ae85d..cb496d0 100644
---- a/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
-@@ -35,5 +35,5 @@ ENDIF()
- 
- 
- INSTALL(FILES ${HEADERS} DESTINATION
--    
${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/)
-+     ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/)
- 
-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 9a6f4cc..1248233 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 e13d37c..e817940 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 62e9b60..2c27272 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 63d60b9..a4309d1 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 925daf5..2d42fef 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 4a91d34..956f411 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 2c0dea4..ea16b39 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 93fc5a9..5965b25 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 1640ef5..d979eed 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 769bd69..76cb55e 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 4585b22..9177777 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 b49c92e..76fab68 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 66e4eb8..806f453 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 eac6ed0..d587e6c 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 687821f..0fa165e 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_mesh/stk_mesh/base/CMakeLists.txt 
b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
-index 67bab20..868f7dd 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_search/stk_search/CMakeLists.txt 
b/packages/stk/stk_search/stk_search/CMakeLists.txt
-index ae6cc04..2db70c5 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 ca6e439..6f3e687 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 2c5028c..73dd3cf 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 68dee72..5eea375 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 1cf5b6a..78cccf2 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 adc5405..7caf056 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 7baf709..c200f4f 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 970cbc6..9c45e37 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 b1b5c34..0b73634 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_topology/stk_topology/CMakeLists.txt 
b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
-index 6898eea..ec418db 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 e9d96ef..ed20e03 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 91d6527..42be71d 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 175fe19..196ea02 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 650aa7d..88372c8 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 2107505..5027d4e 100644
---- a/packages/stk/stk_util/stk_util/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/CMakeLists.txt
-@@ -18,6 +18,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 3a86247..289aeee 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 50c9e86..bae352b 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 b6b4635..536172d 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 0708dfc..4449b56 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 6b92b6b..07ac185 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 b90c66b..3a83bb3 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 030a7c6..c0d49dc 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/sci-libs/trilinos/files/trilinos-12.12.1-fix_sundance_compilation.patch 
b/sci-libs/trilinos/files/trilinos-12.12.1-fix_sundance_compilation.patch
deleted file mode 100644
index 377485bfe..000000000
--- a/sci-libs/trilinos/files/trilinos-12.12.1-fix_sundance_compilation.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/packages/Sundance/Playa/src/NOX_Playa_Vector.cpp 
b/packages/Sundance/Playa/src/NOX_Playa_Vector.cpp
-index 637936e..3dbf1a9 100644
---- a/packages/Sundance/Playa/src/NOX_Playa_Vector.cpp
-+++ b/packages/Sundance/Playa/src/NOX_Playa_Vector.cpp
-@@ -191,6 +191,14 @@ NOX::Abstract::Vector& NOX::NOXPlaya::Vector::init(double 
value)
-   return *this;
- }
- 
-+NOX::Abstract::Vector& NOX::NOXPlaya::Vector::random(bool useSeed, int seed)
-+{
-+  if (useSeed)
-+    Playa::Rand::setLocalSeed(x.comm(), seed);
-+  x.randomize();
-+  return *this;
-+}
-+
- 
- NOX::Abstract::Vector& NOX::NOXPlaya::Vector::abs(
-                                            const NOX::Abstract::Vector& base)
-diff --git a/packages/Sundance/Playa/src/NOX_Playa_Vector.hpp 
b/packages/Sundance/Playa/src/NOX_Playa_Vector.hpp
-index bdf70e2..3143059 100644
---- a/packages/Sundance/Playa/src/NOX_Playa_Vector.hpp
-+++ b/packages/Sundance/Playa/src/NOX_Playa_Vector.hpp
-@@ -116,6 +116,9 @@ public:
-   /** Initialize all elements to a constant */
-   NOX::Abstract::Vector& init(double value);
- 
-+  /** Initialize all elements of this vector with a random value */
-+  NOX::Abstract::Vector& random(bool useSeed = false, int seed = 1);
-+
-   /** Assignment operator */
-   NOX::Abstract::Vector& operator=(const NOX::NOXPlaya::Vector& y);
-   /** Assignment operator */

diff --git a/sci-libs/trilinos/files/trilinos-12.12.1-superlu-5.patch 
b/sci-libs/trilinos/files/trilinos-12.12.1-superlu-5.patch
deleted file mode 100644
index 24e8dbabd..000000000
--- a/sci-libs/trilinos/files/trilinos-12.12.1-superlu-5.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 83bec239ac6a63ed895a52567eab18925dd6a8cb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloe...@gmail.com>
-Date: Wed, 1 Jun 2016 19:38:01 +0200
-Subject: [PATCH] compatibility with SuperLU 5
-
-Thanks to Eric Bavier <bav...@cray.com>.
----
- cmake/TPLs/FindTPLSuperLU.cmake          | 42 +++++++++++++++++++++++-
- packages/amesos/cmake/Amesos_config.h.in |  3 ++
- packages/amesos/src/Amesos_Superlu.cpp   | 15 ++++++---
- packages/ifpack/cmake/Ifpack_config.h.in |  3 ++
- packages/ifpack/src/Ifpack_SILU.cpp      |  6 +++-
- packages/ifpack/src/Ifpack_SILU.h        |  2 ++
- 6 files changed, 65 insertions(+), 6 deletions(-)
-
-diff --git a/cmake/TPLs/FindTPLSuperLU.cmake b/cmake/TPLs/FindTPLSuperLU.cmake
-index fae2db230b0..f2321ba93dc 100644
---- a/cmake/TPLs/FindTPLSuperLU.cmake
-+++ b/cmake/TPLs/FindTPLSuperLU.cmake
-@@ -56,5 +56,45 @@
- 
- TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( SuperLU
-   REQUIRED_HEADERS supermatrix.h slu_ddefs.h
--  REQUIRED_LIBS_NAMES "superlu superlu_3.0 superlu_4.0 superlu_4.1 
superlu_4.2 superlu_4.3"
-+  REQUIRED_LIBS_NAMES "superlu superlu_3.0 superlu_4.0 superlu_4.1 
superlu_4.2 superlu_4.3 superlu_5.0"
-   )
-+
-+include(CheckCSourceCompiles)
-+include(MultilineSet)
-+
-+# API change in SuperLU 5.0 requires a 'GlobalLU_t' parameter for
-+# *gssvx, *gsisx, *gstrf, and *gsitrf routines.  Check whether these
-+# parameters are needed.
-+
-+FUNCTION(CHECK_SUPERLU_GLOBALLU_T_ARG  VARNAME)
-+  SET(SOURCE
-+  "
-+#include <slu_ddefs.h>
-+
-+int main()
-+{
-+  GlobalLU_t lu;
-+  superlu_options_t opt;
-+  SuperMatrix M;
-+  int *i;
-+  double *d;
-+  void *v;
-+  char *c;
-+  SuperLUStat_t stat;
-+  mem_usage_t mem;
-+
-+  dgsisx(&opt,&M,i,i,i,c,d,d,&M,&M,v,*i,&M,&M,d,d,&lu,&mem,&stat,i);
-+  return 0;
-+}
-+"
-+  )
-+
-+  SET(CMAKE_REQUIRED_INCLUDES ${TPL_SuperLU_INCLUDE_DIRS})
-+  SET(CMAKE_REQUIRED_LIBRARIES ${TPL_SuperLU_LIBRARIES} 
${TPL_METIS_LIBRARIES} ${TPL_BLAS_LIBRARIES})
-+  SET(CMAKE_REQUIRED_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
-+  CHECK_C_SOURCE_COMPILES("${SOURCE}" ${VARNAME})
-+ENDFUNCTION()
-+
-+IF (TPL_ENABLE_SuperLU)
-+  CHECK_SUPERLU_GLOBALLU_T_ARG(HAVE_SUPERLU_GLOBALLU_T_ARG)
-+ENDIF(TPL_ENABLE_SuperLU)
-diff --git a/packages/amesos/cmake/Amesos_config.h.in 
b/packages/amesos/cmake/Amesos_config.h.in
-index bc4967e3433..6150ed80d2f 100644
---- a/packages/amesos/cmake/Amesos_config.h.in
-+++ b/packages/amesos/cmake/Amesos_config.h.in
-@@ -93,3 +93,6 @@
- 
- /* Define to 1 if SuperLU_DIST's LUstructInit is declared with 2 arguments. */
- #cmakedefine HAVE_SUPERLUDIST_LUSTRUCTINIT_2ARG
-+
-+/* Define to 1 if SuperLU's *gssvx and *gsisx routines need a GlobalLU_t 
argument. */
-+#cmakedefine HAVE_SUPERLU_GLOBALLU_T_ARG
-diff --git a/packages/amesos/src/Amesos_Superlu.cpp 
b/packages/amesos/src/Amesos_Superlu.cpp
-index 3651b65f4da..7adf0dff62d 100644
---- a/packages/amesos/src/Amesos_Superlu.cpp
-+++ b/packages/amesos/src/Amesos_Superlu.cpp
-@@ -55,6 +55,7 @@ class SLUData {
- #endif
-   SLU::superlu_options_t SLU_options;
-   SLU::mem_usage_t mem_usage;
-+  SLU::GlobalLU_t lu;      // Use for gssvx and gsisx in SuperLU 5.0
-   SLU::fact_t refactor_option ;         //  SamePattern or 
SamePattern_SameRowPerm
- 
-   SLUData() {
-@@ -480,8 +481,11 @@ int Amesos_Superlu::NumericFactorization()
-             &perm_c_[0], &perm_r_[0], &etree_[0], &equed_, &R_[0],
-             &C_[0], &(data_->L), &(data_->U), NULL, 0,
-             &(data_->B), &(data_->X), &rpg, &rcond, &ferr_[0],
--            &berr_[0], &(data_->mem_usage), &SLU_stat,
--            &Ierr[0] );
-+            &berr_[0],
-+#ifdef HAVE_SUPERLU_GLOBALLU_T_ARG
-+            &(data_->lu),
-+#endif
-+            &(data_->mem_usage), &SLU_stat, &Ierr[0] );
-     SLU::StatFree( &SLU_stat ) ;
-   }
- 
-@@ -611,8 +615,11 @@ int Amesos_Superlu::Solve()
-             &perm_c_[0], &perm_r_[0], &etree_[0], &equed_, &R_[0],
-             &C_[0], &(data_->L), &(data_->U), NULL, 0,
-             &(data_->B), &(data_->X), &rpg, &rcond, &ferr_[0],
--            &berr_[0], &(data_->mem_usage), &SLU_stat,
--            &Ierr);
-+            &berr_[0],
-+#ifdef HAVE_SUPERLU_GLOBALLU_T_ARG
-+            &(data_->lu),
-+#endif
-+            &(data_->mem_usage), &SLU_stat, &Ierr);
-     //    assert( equed_ == 'N' ) ;
-     StatFree( &SLU_stat ) ;
-   }
-diff --git a/packages/ifpack/cmake/Ifpack_config.h.in 
b/packages/ifpack/cmake/Ifpack_config.h.in
-index 81fba21a99f..91f11101f87 100644
---- a/packages/ifpack/cmake/Ifpack_config.h.in
-+++ b/packages/ifpack/cmake/Ifpack_config.h.in
-@@ -53,6 +53,9 @@
- /* Define if Ifpack_DynamicFactory is enabled */
- #cmakedefine HAVE_IFPACK_DYNAMIC_FACTORY
- 
-+/* Define to 1 if SuperLU's dgsitrf routine needs a GlobalLU_t argument. */
-+#cmakedefine HAVE_SUPERLU_GLOBALLU_T_ARG
-+
- /* Add macros for declaring functions deprecated */
- @IFPACK_DEPRECATED_DECLARATIONS@
- 
-diff --git a/packages/ifpack/src/Ifpack_SILU.cpp 
b/packages/ifpack/src/Ifpack_SILU.cpp
-index e69f32b1277..32b58e1a60b 100644
---- a/packages/ifpack/src/Ifpack_SILU.cpp
-+++ b/packages/ifpack/src/Ifpack_SILU.cpp
-@@ -297,7 +297,11 @@ int Ifpack_SILU::Compute()
-   int panel_size = sp_ienv(1);
-   int relax      = sp_ienv(2);
-   int info=0;
--  
dgsitrf(&options_,&SAc_,relax,panel_size,etree_,NULL,0,perm_c_,perm_r_,&SL_,&SU_,&stat_,&info);
-+  
dgsitrf(&options_,&SAc_,relax,panel_size,etree_,NULL,0,perm_c_,perm_r_,&SL_,&SU_,
-+#ifdef HAVE_SUPERLU_GLOBALLU_T_ARG
-+          &lu_,
-+#endif
-+          &stat_,&info);
-   if(info<0) IFPACK_CHK_ERR(info);
- 
-   IsComputed_ = true;
-diff --git a/packages/ifpack/src/Ifpack_SILU.h 
b/packages/ifpack/src/Ifpack_SILU.h
-index a1c7b1a86f0..0a7a7d8dc63 100644
---- a/packages/ifpack/src/Ifpack_SILU.h
-+++ b/packages/ifpack/src/Ifpack_SILU.h
-@@ -428,6 +428,8 @@ class Ifpack_SILU: public Ifpack_Preconditioner {
-   mutable double ApplyInverseTime_;
-   //! Used for timing issues
-   mutable Epetra_Time Time_;
-+  //! SuperLU global LU data
-+  mutable GlobalLU_t lu_;
-   //! SuperLU stats
-   mutable SuperLUStat_t stat_;
-   //! SuperLU options

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
deleted file mode 100644
index c59d278ca..000000000
--- 
a/sci-libs/trilinos/files/trilinos-12.14.1-fix_install_paths_for_destdir.patch
+++ /dev/null
@@ -1,973 +0,0 @@
-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/metadata.xml b/sci-libs/trilinos/metadata.xml
deleted file mode 100644
index 30049396c..000000000
--- a/sci-libs/trilinos/metadata.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-       <maintainer type="person">
-               <email>tam...@gentoo.org</email>
-               <name>Matthias Maier</name>
-       </maintainer>
-       <maintainer type="person">
-               <email>andyspi...@gmail.com</email>
-       </maintainer>
-       <maintainer type="project">
-               <email>s...@gentoo.org</email>
-               <name>Gentoo Science Project</name>
-       </maintainer>
-       <longdescription lang="en">
-The Trilinos Project is an effort to develop algorithms and enabling
-technologies within an object-oriented software framework for the solution
-of large-scale, complex multi-physics engineering and scientific problems.
-</longdescription>
-       <use>
-               <flag name="adolc">Add support for adolc 
(<pkg>sci-libs/adolc</pkg>)</flag>
-               <flag name="arprec">Add support for arprec 
(<pkg>sci-libs/arprec</pkg>)</flag>
-               <flag name="boost">Add support for boost 
(<pkg>dev-libs/boost</pkg>)</flag>
-               <flag name="clp">Add support for clp 
(<pkg>sci-libs/coinor-clp</pkg>)</flag>
-               <flag name="cppunit">Add support for (...)</flag>
-               <flag name="cuda">Add support for cuda 
(<pkg>dev-util/nvidia-cuda-toolkit</pkg>)</flag>
-               <flag name="eigen">Add support for eigen 
(<pkg>dev-cpp/eigen</pkg>)</flag>
-               <flag name="glpk">Add support for (...)</flag>
-               <flag name="gtest">Add support for gtest 
(<pkg>dev-cpp/gtest</pkg>)</flag>
-               <flag name="hwloc">Add support for hwloc 
(<pkg>sys-apps/hwloc</pkg>)</flag>
-               <flag name="hdf5">Add support for hdf5 
(<pkg>sci-libs/hdf5</pkg>)</flag>
-               <flag name="hypre">Add support for hypre 
(<pkg>sci-libs/hypre</pkg>)</flag>
-               <flag name="matio">Add support for matio 
(<pkg>sci-libs/matio</pkg>)</flag>
-               <flag name="metis">
-Add support for metis (<pkg>sci-libs/metis</pkg> or 
<pkg>sci-libs/parmetis</pkg>)
-</flag>
-               <flag name="mkl">Add support for mkl 
(<pkg>sci-libs/mkl</pkg>)</flag>
-               <flag name="mumps">Add support for mumps 
(<pkg>sci-libs/mumps</pkg>)</flag>
-               <flag name="netcdf">Add support for netcdf 
(<pkg>sci-libs/netcdf</pkg>)</flag>
-               <flag name="petsc">Add support for petsc 
(<pkg>sci-mathematics/petsc</pkg>)</flag>
-               <flag name="qd">Add support for qd 
(<pkg>sci-libs/qd</pkg>)</flag>
-               <flag name="scalapack">Add support for scalapack 
(<pkg>virtual/scalapack</pkg>)</flag>
-               <flag name="scotch">Add support for scotch 
(<pkg>sci-libs/scotch</pkg>)</flag>
-               <flag name="sparse">Add support for sparse matrix solvers 
(<pkg>sci-libs/umfpack</pkg>)</flag>
-               <flag name="superlu">Add support for superlu 
(<pkg>sci-libs/superlu</pkg>)</flag>
-               <flag name="taucs">Add support for taucs 
(<pkg>sci-libs/taucs</pkg>)</flag>
-               <flag name="tbb">Add support for threading building blocks 
library (<pkg>dev-cpp/tbb</pkg>)</flag>
-               <flag name="tvmet">Add support for tvmet 
(<pkg>dev-libs/tvmet</pkg>)</flag>
-               <flag name="yaml">Add support for yaml 
(<pkg>dev-cpp/yaml</pkg>)</flag>
-       </use>
-</pkgmetadata>

diff --git a/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild 
b/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
deleted file mode 100644
index d5846614c..000000000
--- a/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 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}/${P}-Source"
-
-PATCHES=(
-       "${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
-)
-
-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)"
-       )
-
-       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
-}

diff --git a/sci-libs/trilinos/trilinos-12.14.1.ebuild 
b/sci-libs/trilinos/trilinos-12.14.1.ebuild
deleted file mode 100644
index 2320a2256..000000000
--- a/sci-libs/trilinos/trilinos-12.14.1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# 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_SEACASChaco=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 "${ED}"/TrilinosRepoVersion.txt
-       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
-}

[gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/

Reply via email to