* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/
@ 2013-04-22 1:40 Christoph Junghans
0 siblings, 0 replies; 11+ messages in thread
From: Christoph Junghans @ 2013-04-22 1:40 UTC (permalink / raw
To: gentoo-commits
commit: 31de11556fbf3abe605e19c3d0ecd59a488fd4b1
Author: Matthias Maier <tamiko <AT> kyomu <DOT> 43-1 <DOT> org>
AuthorDate: Wed Apr 3 09:15:35 2013 +0000
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Wed Apr 3 09:16:56 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=31de1155
Bump trilinos to version 11.0.3
Notable changes:
- Install libraries directly to $(get_libdir) instead of
$(get_libdir)/trilinos: Trilinos libraries have a sufficient distinct
name so a file collision is unlikely. More important, this fixes issues
for third party projects expecting the libraries to reside in
$(get_libdir).
- Fix install locations for the CMake project config files.
- Work around a bug where trilinos installs to /var/tmp/portage/...
---
sci-libs/trilinos/ChangeLog | 3 +
.../files/trilinos-11.0.3-fix-install-paths.patch | 76 ++++++++++++
sci-libs/trilinos/trilinos-11.0.3.ebuild | 128 ++++++++++++++++++++
3 files changed, 207 insertions(+), 0 deletions(-)
diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index 5461e6f..6c5b81b 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 03 Apr 2013; Matthias Maier <tamiko@kyomu.43-1.org> trilinos-11.0.3.ebuild:
+ Version bump; correct install paths; fix prefix support
+
03 Mar 2013; Justin Lecher <jlec@gentoo.org> trilinos-10.10.1.ebuild:
Update to new qt deps names
diff --git a/sci-libs/trilinos/files/trilinos-11.0.3-fix-install-paths.patch b/sci-libs/trilinos/files/trilinos-11.0.3-fix-install-paths.patch
new file mode 100644
index 0000000..8ec15a4
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-11.0.3-fix-install-paths.patch
@@ -0,0 +1,76 @@
+--- a/cmake/tribits/package_arch/TribitsGlobalMacros.cmake 2013-04-03 11:00:54.342539245 +0200
++++ b/cmake/tribits/package_arch/TribitsGlobalMacros.cmake 2013-04-03 11:04:30.283837064 +0200
+@@ -209,26 +209,6 @@
+ ADVANCED_SET(${PROJECT_NAME}_LINK_SEARCH_START_STATIC OFF CACHE BOOL
+ "If on, then the properter LINK_SEARCH_START_STATIC will be added to all executables." )
+ ENDIF()
+-
+- ADVANCED_SET(${PROJECT_NAME}_INSTALL_INCLUDE_DIR "include"
+- CACHE PATH
+- "Location where the headers will be installed. If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}. If given as an absolute path, it will used as such. Default is 'include'"
+- )
+-
+- ADVANCED_SET(${PROJECT_NAME}_INSTALL_LIB_DIR "lib"
+- CACHE PATH
+- "Location where the libraries will be installed. If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}. If given as an absolute path, it will used as such. Default is 'lib'"
+- )
+-
+- ADVANCED_SET(${PROJECT_NAME}_INSTALL_RUNTIME_DIR "bin"
+- CACHE PATH
+- "Location where the runtime DLLs and designated programs will be installed. If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}. If given as an absolute path, it will used as such. Default is 'bin'"
+- )
+-
+- ADVANCED_SET(${PROJECT_NAME}_INSTALL_EXAMPLE_DIR "example"
+- CACHE PATH
+- "Location where assorted examples will be installed. If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}. If given as an absolute path, it will used as such. Default is 'example'"
+- )
+
+ IF ("${${PROJECT_NAME}_INSTALL_LIBRARIES_AND_HEADERS_DEFAULT}" STREQUAL "")
+ # Assume the TriBITS project wants to install headers and libraries by default
+--- a/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake 2012-11-12 14:58:00.000000000 +0100
++++ b/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake 2012-11-12 14:42:47.000000000 +0100
+@@ -367,7 +367,7 @@
+
+ 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
+ )
+
+@@ -563,7 +563,7 @@
+ IF(HAS_INSTALL_TARGETS)
+ INSTALL(
+ EXPORT ${PROJECT_NAME}
+- DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
++ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
+ FILE ${PROJECT_NAME}Targets.cmake
+ )
+ # Import the targets in applications.
+@@ -589,7 +589,7 @@
+
+ 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
+ )
+
+@@ -632,7 +632,7 @@
+
+ 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()
+--- a/packages/fei/base/CMakeLists.txt 2012-11-12 14:05:18.000000000 +0100
++++ b/packages/fei/base/CMakeLists.txt 2012-11-12 14:05:18.000000000 +0100
+@@ -54,5 +54,5 @@
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/include)
++ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
diff --git a/sci-libs/trilinos/trilinos-11.0.3.ebuild b/sci-libs/trilinos/trilinos-11.0.3.ebuild
new file mode 100644
index 0000000..b7aa923
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-11.0.3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="2"
+inherit cmake-utils
+
+DESCRIPTION="Scientific library collection for large scale problems"
+HOMEPAGE="http://trilinos.sandia.gov/"
+SRC_URI="${P}-Source.tar.gz"
+SRC_PAGE="11.0"
+
+KEYWORDS="~amd64 ~x86"
+RESTRICT="fetch"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+
+IUSE="arprec boost cuda hdf5 hwloc netcdf qd qt scotch taucs tbb umfpack zlib"
+
+RDEPEND="virtual/blas
+ virtual/lapack
+ virtual/mpi
+ >=sci-libs/scalapack-2
+ arprec? ( sci-libs/arprec )
+ boost? ( dev-libs/boost )
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
+ hdf5? ( sci-libs/hdf5[mpi] )
+ hwloc? ( sys-apps/hwloc )
+ netcdf? ( sci-libs/netcdf )
+ qd? ( sci-libs/qd )
+ qt? ( >=x11-libs/qt-gui-4.5 )
+ scotch? ( sci-libs/scotch[mpi] )
+ taucs? ( sci-libs/taucs )
+ tbb? ( dev-cpp/tbb )
+ umfpack? ( sci-libs/umfpack )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}-Source"
+
+pkg_nofetch() {
+ einfo "Sandia requires that you register to the site in order to download Trilinos."
+ einfo "Please download ${SRC_URI} from:"
+ einfo "http://trilinos.sandia.gov/download/trilinos-${SRC_PAGE}.html"
+ einfo "and move it to ${DISTDIR}"
+}
+
+function trilinos_alternatives {
+ alt_dirs=""
+ for d in $(pkg-config --libs-only-L $1); do
+ alt_dirs="${alt_dirs};${d:2}"
+ done
+ arg="-D${2}_LIBRARY_DIRS=${alt_dirs:1}"
+ mycmakeargs+=(
+ $arg
+ )
+
+ alt_libs=""
+ for d in $(pkg-config --libs-only-l $1); do
+ alt_libs="${alt_libs};${d:2}"
+ done
+ arg="-D${2}_LIBRARY_NAMES=${alt_libs:1}"
+ mycmakeargs+=(
+ $arg
+ )
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-fix-install-paths.patch
+}
+
+src_configure() {
+ CMAKE_BUILD_TYPE="release"
+
+ mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DTrilinos_ENABLE_ALL_PACKAGES=ON
+
+ -DTrilinos_INSTALL_BIN_DIR="bin"
+ -DTrilinos_INSTALL_CONFIG_DIR="$(get_libdir)/cmake"
+ -DTrilinos_INSTALL_INCLUDE_DIR="include/trilinos"
+ -DTrilinos_INSTALL_LIB_DIR="$(get_libdir)"
+ -DTrilinos_INSTALL_EXAMPLE_DIR="share/trilinos/example"
+
+ # Tests
+ $(cmake-utils_use test Trilinos_ENABLE_TESTS)
+
+ # Mandatory dependencies
+ -DTPL_ENABLE_BinUtils=ON
+ -DTPL_ENABLE_MPI=ON
+ -DTPL_ENABLE_BLAS=ON
+ -DTPL_ENABLE_LAPACK=ON
+ -DTPL_ENABLE_BLACS=ON
+ -DTPL_ENABLE_SCALAPACK=ON
+ -DTrilinos_EXTRA_LINK_FLAGS="-lmpi -lmpi_cxx"
+
+ # Optional dependencies
+ $(cmake-utils_use arprec TPL_ENABLE_ARPREC)
+ $(cmake-utils_use boost TPL_ENABLE_Boost)
+ $(cmake-utils_use boost TPL_ENABLE_BoostLib)
+ $(cmake-utils_use cuda TPL_ENABLE_CUDA)
+ $(cmake-utils_use hdf5 TPL_ENABLE_HDF5)
+ $(cmake-utils_use hwloc TPL_ENABLE_HWLOC)
+ $(cmake-utils_use netcdf TPL_ENABLE_Netcdf)
+ $(cmake-utils_use qd TPL_ENABLE_QD)
+ $(cmake-utils_use qt TPL_ENABLE_QT)
+ $(cmake-utils_use scotch TPL_ENABLE_Scotch)
+ $(cmake-utils_use taucs TPL_ENABLE_TAUCS)
+ $(cmake-utils_use tbb TPL_ENABLE_TBB)
+ $(cmake-utils_use umfpack TPL_ENABLE_UMFPACK)
+ $(cmake-utils_use zlib TPL_ENABLE_Zlib)
+ )
+
+ # Scotch libraries
+ if use scotch; then
+ mycmakeargs+=( -DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch" )
+ fi
+
+ # Add BLAS libraries
+ trilinos_alternatives blas BLAS
+ trilinos_alternatives lapack LAPACK
+ trilinos_alternatives scalapack SCALAPACK
+ trilinos_alternatives scalapack BLACS
+
+ mycmakeargs+=( -DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs" )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/
@ 2013-11-12 16:43 Nicolas Bock
0 siblings, 0 replies; 11+ messages in thread
From: Nicolas Bock @ 2013-11-12 16:43 UTC (permalink / raw
To: gentoo-commits
commit: 66b1558cb9ef6d69d6c444e23d85373adc437c97
Author: layman <layman <AT> localhost>
AuthorDate: Mon Nov 11 19:11:27 2013 +0000
Commit: Nicolas Bock <nicolasbock <AT> gmail <DOT> com>
CommitDate: Tue Nov 12 01:27:15 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=66b1558c
sci-libs/trilinos: Fix project config directory; version bump
This commit fixes the installation path for the Trilinos project
configuration so that it now resides under $(get_libdir)/cmake instead of
$(get_libdir)/trilinos/cmake.
Furthermore, a version bump to 11.4.2
---
.../files/trilinos-11.2.3-fix-install-paths.patch | 62 ++++++++++++++++++++++
.../files/trilinos-11.4.2-fix-install-paths.patch | 60 +++++++++++++++++++++
sci-libs/trilinos/trilinos-11.2.3-r1.ebuild | 1 +
...ilinos-11.2.3.ebuild => trilinos-11.4.2.ebuild} | 5 ++
4 files changed, 128 insertions(+)
diff --git a/sci-libs/trilinos/files/trilinos-11.2.3-fix-install-paths.patch b/sci-libs/trilinos/files/trilinos-11.2.3-fix-install-paths.patch
new file mode 100644
index 0000000..0118d6b
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-11.2.3-fix-install-paths.patch
@@ -0,0 +1,62 @@
+ IF ("${${PROJECT_NAME}_INSTALL_LIBRARIES_AND_HEADERS_DEFAULT}" STREQUAL "")
+ # Assume the TriBITS project wants to install headers and libraries by default
+--- a/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake 2012-11-12 14:58:00.000000000 +0100
++++ b/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake 2012-11-12 14:42:47.000000000 +0100
+@@ -267,8 +267,8 @@
+ # directories using the installed config file. This is to deal with
+ # installers that allow relocation of the install tree at *install*
+ # time.
+- SET(LIBRARY_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../${${PROJECT_NAME}_INSTALL_LIB_DIR}")
+- SET(INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
++ SET(LIBRARY_DIRS "${${PROJECT_NAME}_INSTALL_LIB_DIR}")
++ SET(INCLUDE_DIRS "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
+
+ # Custom code in configuration file.
+ SET(PACKAGE_CONFIG_CODE "")
+@@ -297,7 +297,7 @@
+
+ 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
+ )
+
+@@ -477,8 +477,8 @@
+ # directories using the installed config file. This is to deal with
+ # installers that allow relocation of the install tree at *install*
+ # time.
+- SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
+- SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../${${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)
+@@ -493,7 +493,7 @@
+ IF(HAS_INSTALL_TARGETS)
+ INSTALL(
+ EXPORT ${PROJECT_NAME}
+- DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
++ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
+ FILE ${PROJECT_NAME}Targets.cmake
+ )
+ # Import the targets in applications.
+@@ -519,7 +519,7 @@
+
+ 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
+ )
+
+@@ -562,7 +562,7 @@
+
+ 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-11.4.2-fix-install-paths.patch b/sci-libs/trilinos/files/trilinos-11.4.2-fix-install-paths.patch
new file mode 100644
index 0000000..a9c222e
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-11.4.2-fix-install-paths.patch
@@ -0,0 +1,60 @@
+--- a/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake 2012-11-12 14:58:00.000000000 +0100
++++ b/cmake/tribits/package_arch/TribitsWriteClientExportFiles.cmake 2012-11-12 14:42:47.000000000 +0100
+@@ -478,8 +478,8 @@
+ # directories using the installed config file. This is to deal with
+ # installers that allow relocation of the install tree at *install*
+ # time.
+- SET(FULL_LIBRARY_DIRS_SET "\${CMAKE_CURRENT_LIST_DIR}/../../../${${PROJECT_NAME}_INSTALL_LIB_DIR}")
+- SET(FULL_INCLUDE_DIRS_SET "\${CMAKE_CURRENT_LIST_DIR}/../../../${${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 "")
+@@ -548,7 +548,7 @@
+ 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
+ )
+
+@@ -766,8 +766,8 @@
+ # directories using the installed config file. This is to deal with
+ # installers that allow relocation of the install tree at *install*
+ # time.
+- SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
+- SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../${${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)
+@@ -782,7 +782,7 @@
+ IF(HAS_INSTALL_TARGETS)
+ INSTALL(
+ EXPORT ${PROJECT_NAME}
+- DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
++ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
+ FILE ${PROJECT_NAME}Targets.cmake
+ )
+ # Import the targets in applications.
+@@ -809,7 +809,7 @@
+
+ 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()
+@@ -853,7 +853,7 @@
+
+ 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/trilinos-11.2.3-r1.ebuild b/sci-libs/trilinos/trilinos-11.2.3-r1.ebuild
new file mode 120000
index 0000000..0b4d819
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-11.2.3-r1.ebuild
@@ -0,0 +1 @@
+trilinos-11.4.2.ebuild
\ No newline at end of file
diff --git a/sci-libs/trilinos/trilinos-11.2.3.ebuild b/sci-libs/trilinos/trilinos-11.4.2.ebuild
similarity index 97%
rename from sci-libs/trilinos/trilinos-11.2.3.ebuild
rename to sci-libs/trilinos/trilinos-11.4.2.ebuild
index b22fa58..9fcddac 100644
--- a/sci-libs/trilinos/trilinos-11.2.3.ebuild
+++ b/sci-libs/trilinos/trilinos-11.4.2.ebuild
@@ -81,6 +81,10 @@ trilinos_enable() {
cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}}
}
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-fix-install-paths.patch
+}
+
src_configure() {
local mycmakeargs=(
@@ -89,6 +93,7 @@ src_configure() {
-DTrilinos_ENABLE_ALL_PACKAGES=ON
-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
+ -DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
-DTPL_ENABLE_BinUtils=ON
-DTPL_ENABLE_MPI=ON
-DTPL_ENABLE_BLAS=ON
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/
@ 2015-03-14 8:21 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2015-03-14 8:21 UTC (permalink / raw
To: gentoo-commits
commit: 4a75c1497578f224852b2bc4f64fc29763a3dee8
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 17:12:28 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 08:21:00 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=4a75c149
sci-libs/trilinos: fix location of target config files
Package-Manager: portage-2.2.15
sci-libs/trilinos/ChangeLog | 9 +++++++++
sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch | 2 +-
sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch | 2 +-
.../{trilinos-11.12.1.ebuild => trilinos-11.12.1-r1.ebuild} | 0
.../{trilinos-11.14.1.ebuild => trilinos-11.14.1-r1.ebuild} | 0
5 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index 1e694b5..b773567 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,15 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*trilinos-11.12.1-r1 (13 Mar 2015)
+*trilinos-11.14.1-r1 (13 Mar 2015)
+
+ 13 Mar 2015; Matthias Maier <tamiko@gentoo.org> +trilinos-11.12.1-r1.ebuild,
+ +trilinos-11.14.1-r1.ebuild, -trilinos-11.12.1.ebuild,
+ -trilinos-11.14.1.ebuild, files/trilinos-11.12.1-fix-install-paths.patch,
+ files/trilinos-11.14.1-fix-install-paths.patch:
+ sci-libs/trilinos: fix location of target config files
+
*trilinos-11.14.1 (13 Mar 2015)
13 Mar 2015; Matthias Maier <tamiko@gentoo.org>
diff --git a/sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch b/sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch
index 130f3ce..9a02292 100644
--- a/sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch
+++ b/sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch
@@ -26,7 +26,7 @@ index e1c633f..864488f 100644
INSTALL(
EXPORT ${PACKAGE_NAME}
- DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}"
-+ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
++ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}"
FILE ${PACKAGE_NAME}Targets.cmake
)
ENDIF()
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
index acfe4bb..32f25f3 100644
--- 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
@@ -26,7 +26,7 @@ index e1c633f..864488f 100644
INSTALL(
EXPORT ${PACKAGE_NAME}
- DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}"
-+ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
++ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}"
FILE ${PACKAGE_NAME}Targets.cmake
)
ENDIF()
diff --git a/sci-libs/trilinos/trilinos-11.12.1.ebuild b/sci-libs/trilinos/trilinos-11.12.1-r1.ebuild
similarity index 100%
rename from sci-libs/trilinos/trilinos-11.12.1.ebuild
rename to sci-libs/trilinos/trilinos-11.12.1-r1.ebuild
diff --git a/sci-libs/trilinos/trilinos-11.14.1.ebuild b/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild
similarity index 100%
rename from sci-libs/trilinos/trilinos-11.14.1.ebuild
rename to sci-libs/trilinos/trilinos-11.14.1-r1.ebuild
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/
@ 2015-03-14 8:21 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2015-03-14 8:21 UTC (permalink / raw
To: gentoo-commits
commit: c1b9f99c452b2bdade304ce3d1ea0e1da52f4046
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 16:50:29 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 16:50:29 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=c1b9f99c
sci-libs/trilinos: version bump, some preliminary metadata
Package-Manager: portage-2.2.15
sci-libs/trilinos/ChangeLog | 8 +
.../files/trilinos-11.14.1-fix-install-paths.patch | 61 ++
...nos-11.14.1-fix_install_paths_for_destdir.patch | 617 +++++++++++++++++++++
sci-libs/trilinos/metadata.xml | 73 +--
sci-libs/trilinos/trilinos-11.14.1.ebuild | 207 +++++++
5 files changed, 931 insertions(+), 35 deletions(-)
diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index ed2de56..1e694b5 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,14 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*trilinos-11.14.1 (13 Mar 2015)
+
+ 13 Mar 2015; Matthias Maier <tamiko@gentoo.org>
+ +files/trilinos-11.14.1-fix-install-paths.patch,
+ +files/trilinos-11.14.1-fix_install_paths_for_destdir.patch,
+ +trilinos-11.14.1.ebuild, metadata.xml:
+ sci-libs/trilinos: version bump, some preliminary metadata
+
19 Feb 2015; Christoph Junghans <ottxor@gentoo.org> trilinos-11.0.3.ebuild,
trilinos-11.10.2.ebuild, trilinos-11.12.1.ebuild, trilinos-11.4.2.ebuild:
BSD/LGPL-2.1 never implies a fetch restriction, updated Manifest
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
new file mode 100644
index 0000000..acfe4bb
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch
@@ -0,0 +1,61 @@
+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}/${PROJECT_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-11.14.1-fix_install_paths_for_destdir.patch b/sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch
new file mode 100644
index 0000000..e24fc49
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch
@@ -0,0 +1,617 @@
+diff --git a/commonTools/gtest/CMakeLists.txt b/commonTools/gtest/CMakeLists.txt
+index 9367010..17f8892 100644
+--- a/commonTools/gtest/CMakeLists.txt
++++ b/commonTools/gtest/CMakeLists.txt
+@@ -31,7 +31,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/kokkos/TPL/CMakeLists.txt b/packages/kokkos/TPL/CMakeLists.txt
+index 8119c31..2d74336 100644
+--- a/packages/kokkos/TPL/CMakeLists.txt
++++ b/packages/kokkos/TPL/CMakeLists.txt
+@@ -1,7 +1,7 @@
+
+ TRIBITS_SUBPACKAGE(TPL)
+
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+
+ IF( Kokkos_ENABLE_Cuda )
+
+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 7e0e150..d1ed33a 100644
+--- a/packages/kokkos/core/src/CMakeLists.txt
++++ b/packages/kokkos/core/src/CMakeLists.txt
+@@ -13,7 +13,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/ioss/src/init/CMakeLists.txt b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt
+index 573c972..8056913 100644
+--- a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt
++++ b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt
+@@ -50,5 +50,5 @@ IF (BUILD_TESTING)
+ ENDIF (BUILD_TESTING)
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/init/)
++ ${Trilinos_INSTALL_INCLUDE_DIR}/init/)
+
+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..8f2045c 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..c3cd3b4 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 ec7f650..a98b073 100644
+--- a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
+@@ -22,5 +22,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 e738def..e8ad166 100644
+--- a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
+@@ -47,4 +47,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 38d9b5c..7b1d105 100644
+--- a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
+@@ -50,7 +50,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 0412574..b15f54a 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
+@@ -46,4 +46,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 71c6697..770eb52 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
+@@ -55,7 +55,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 844088a..398640d 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
+@@ -49,5 +49,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 7162134..4738933 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
+@@ -55,4 +55,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..68b3533 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..fa854bc 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..6f2d965 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..e6f5344 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..b27238f 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..411ab23 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..2353f6c 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..3978bf5 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 90ab292..930279b 100644
+--- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
+@@ -47,4 +47,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 2582b19..2f35d7a 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
+@@ -19,4 +19,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 a70b0b8..3f8d6ac 100644
+--- a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
+@@ -63,4 +63,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 55a388e..9a5cbfb 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
+@@ -35,5 +35,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 33de7e0..d904256 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
+@@ -55,4 +55,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..c00793d 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 354b70c..5b8ec85 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
+@@ -83,5 +83,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 3d295e3..aa5869c 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
+@@ -81,4 +81,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 f441b60..e64f34d 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
+@@ -62,4 +62,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 11fb404..b2225e3 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
+@@ -51,4 +51,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 ed25e41..9314e7a 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
+@@ -50,4 +50,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 56b7873..8d83357 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
+@@ -47,4 +47,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 467dfa1..605aefd 100644
+--- a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
++++ b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
+@@ -78,4 +78,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 1cc9609..16e1fe0 100644
+--- a/packages/stk/stk_io/stk_io/CMakeLists.txt
++++ b/packages/stk/stk_io/stk_io/CMakeLists.txt
+@@ -80,7 +80,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 beee08b..1d78255 100644
+--- a/packages/stk/stk_io/stk_io/util/CMakeLists.txt
++++ b/packages/stk/stk_io/stk_io/util/CMakeLists.txt
+@@ -77,4 +77,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 5db69c1..9e60c2e 100644
+--- a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
++++ b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
+@@ -80,7 +80,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_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+index f28c06c..c5e817e 100644
+--- a/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
++++ b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+@@ -72,4 +72,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_search/stk_search/CMakeLists.txt b/packages/stk/stk_search/stk_search/CMakeLists.txt
+index ae6cc04..199c82f 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..dd460d4 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_topology/stk_topology/CMakeLists.txt b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
+index 7364267..f1d03d3 100644
+--- a/packages/stk/stk_topology/stk_topology/CMakeLists.txt
++++ b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
+@@ -72,7 +72,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 667cb5d..ce11394 100644
+--- a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
++++ b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
+@@ -5,4 +5,4 @@
+ FILE(GLOB HEADERS *.hpp)
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
+diff --git a/packages/stk/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_util/stk_util/CMakeLists.txt
+index 02f4bf2..e95b05c 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 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 32115b6..184062a 100644
+--- a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
+@@ -76,5 +76,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 f3ecc5d..8268018 100644
+--- a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
+@@ -74,4 +74,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 51e11fd..dba3e15 100644
+--- a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
+@@ -93,4 +93,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 2fa8a9b..dbc5000 100644
+--- a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
+@@ -71,5 +71,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 4a39491..ed521a4 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
+@@ -79,4 +79,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 b12d75e..054f60d 100644
+--- a/packages/stk/stk_util/stk_util/util/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/util/CMakeLists.txt
+@@ -76,4 +76,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 44e6593..7048850 100644
+--- a/packages/teuchos/kokkoscompat/src/CMakeLists.txt
++++ b/packages/teuchos/kokkoscompat/src/CMakeLists.txt
+@@ -35,7 +35,7 @@ ENDIF()
+ # 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 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 c312433..8a52ec4 100644
+--- a/packages/zoltan/src/CMakeLists.txt
++++ b/packages/zoltan/src/CMakeLists.txt
+@@ -678,5 +678,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 64345d3..e60c2e3 100644
+--- a/packages/zoltan/src/fdriver/CMakeLists.txt
++++ b/packages/zoltan/src/fdriver/CMakeLists.txt
+@@ -35,6 +35,6 @@ TRIBITS_ADD_EXECUTABLE(
+
+ # 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
index 7d6e9e9..e1bfe00 100644
--- a/sci-libs/trilinos/metadata.xml
+++ b/sci-libs/trilinos/metadata.xml
@@ -1,40 +1,43 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
- <maintainer>
- <email>andyspiros@gmail.com</email>
- </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.
+ <herd>sci</herd>
+ <maintainer>
+ <email>andyspiros@gmail.com</email>
+ </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">Undocumented USE</flag>
- <flag name="arprec">Undocumented USE</flag>
- <flag name="boost">Undocumented USE</flag>
- <flag name="clp">Undocumented USE</flag>
- <flag name="cppunit">Undocumented USE</flag>
- <flag name="cuda">Undocumented USE</flag>
- <flag name="eigen">Undocumented USE</flag>
- <flag name="glpk">Undocumented USE</flag>
- <flag name="gtest">Undocumented USE</flag>
- <flag name="hwloc">Undocumented USE</flag>
- <flag name="hypre">Undocumented USE</flag>
- <flag name="metis">Undocumented USE</flag>
- <flag name="mkl">Undocumented USE</flag>
- <flag name="mumps">Undocumented USE</flag>
- <flag name="petsc">Undocumented USE</flag>
- <flag name="qd">Undocumented USE</flag>
- <flag name="scalapack">Undocumented USE</flag>
- <flag name="scotch">Undocumented USE</flag>
- <flag name="sparse">Undocumented USE</flag>
- <flag name="superlu">Undocumented USE</flag>
- <flag name="taucs">Undocumented USE</flag>
- <flag name="tbb">Undocumented USE</flag>
- <flag name="tvmet">Undocumented USE</flag>
- <flag name="umfpack">Undocumented USE</flag>
- <flag name="yaml">Undocumented USE</flag>
- </use>
+<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 (<pkg></pkg>)</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 (<pkg></pkg>)</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/(par)metis</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="umfpack">Add support for umfpack (<pkg>sci-libs/umfpack</pkg>)</flag>
+ <flag name="yaml">Add support for yaml (<pkg>dev-cpp-yaml</pkg>)</flag>
+</use>
</pkgmetadata>
diff --git a/sci-libs/trilinos/trilinos-11.14.1.ebuild b/sci-libs/trilinos/trilinos-11.14.1.ebuild
new file mode 100644
index 0000000..668ae48
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-11.14.1.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs multilib toolchain-funcs
+
+DESCRIPTION="Scientific library collection for large scale problems"
+HOMEPAGE="http://trilinos.sandia.gov/"
+SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+
+IUSE="
+ adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre
+ matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse
+ superlu taucs tbb test threads tvmet yaml zlib
+"
+
+# TODO: fix export cmake function for tests
+RESTRICT="test"
+
+RDEPEND="
+ virtual/blas
+ virtual/lapack
+ virtual/mpi
+ adolc? ( sci-libs/adolc )
+ arprec? ( sci-libs/arprec )
+ boost? ( dev-libs/boost )
+ clp? ( sci-libs/coinor-clp )
+ cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
+ eigen? ( dev-cpp/eigen:3 )
+ gtest? ( dev-cpp/gtest )
+ hdf5? ( sci-libs/hdf5[mpi] )
+ hypre? ( sci-libs/hypre )
+ hwloc? ( sys-apps/hwloc )
+ matio? ( sci-libs/matio )
+ mkl? ( sci-libs/mkl )
+ metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
+ mumps? ( sci-libs/mumps )
+ netcdf? ( sci-libs/netcdf )
+ petsc? ( sci-mathematics/petsc )
+ qd? ( sci-libs/qd )
+ qt4? ( dev-qt/qtgui:4 )
+ scalapack? ( virtual/scalapack )
+ scotch? ( sci-libs/scotch )
+ sparse? ( sci-libs/cxsparse sci-libs/umfpack )
+ superlu? ( sci-libs/superlu )
+ taucs? ( sci-libs/taucs )
+ tbb? ( dev-cpp/tbb )
+ tvmet? ( dev-libs/tvmet )
+ yaml? ( dev-cpp/yaml-cpp )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${P}-Source"
+
+trilinos_conf() {
+ local dirs libs d
+ for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
+ dirs="${dirs};${d:2}"
+ done
+ [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
+ for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
+ libs="${libs};${d:2}"
+ done
+ [[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
+ dirs=""
+ for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
+ dirs="${dirs};${d:2}"
+ done
+ [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
+}
+
+trilinos_enable() {
+ cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}}
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-fix-install-paths.patch
+ epatch "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch
+}
+
+src_configure() {
+
+ # temporarily disable SEACAS and pyTrilinos compilation
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=ON
+ -DCMAKE_INSTALL_PREFIX="${EPREFIX}"
+ -DTrilinos_ENABLE_ALL_PACKAGES=ON
+ -DTrilinos_ENABLE_SEACAS=OFF
+ -DTrilinos_ENABLE_PyTrilinos=OFF
+ -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
+ -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
+ -DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
+ -DTPL_ENABLE_BinUtils=ON
+ -DTPL_ENABLE_MPI=ON
+ -DTPL_ENABLE_BLAS=ON
+ -DTPL_ENABLE_LAPACK=ON
+ $(cmake-utils_use test Trilinos_ENABLE_TESTS)
+ $(trilinos_enable adolc)
+ $(trilinos_enable arprec)
+ $(trilinos_enable boost Boost)
+ $(trilinos_enable boost BoostLib)
+ $(trilinos_enable cppunit Cppunit)
+ $(trilinos_enable clp Clp)
+ $(trilinos_enable cuda)
+ $(trilinos_enable cuda CUSPARSE)
+ $(trilinos_enable cuda Thrust)
+ $(trilinos_enable eigen Eigen)
+ $(trilinos_enable gtest gtest)
+ $(trilinos_enable glpk)
+ $(trilinos_enable hdf5)
+ $(trilinos_enable hwloc)
+ $(trilinos_enable hypre)
+ $(trilinos_enable matio)
+ $(trilinos_enable metis)
+ $(trilinos_enable mkl)
+ $(trilinos_enable mkl PARDISO_MKL)
+ $(trilinos_enable mumps)
+ $(trilinos_enable netcdf Netcdf)
+ $(trilinos_enable petsc)
+ $(trilinos_enable qd)
+ $(trilinos_enable qt4 QT)
+ $(trilinos_enable scalapack)
+ $(trilinos_enable scalapack BLACS)
+ $(trilinos_enable scotch Scotch)
+ $(trilinos_enable sparse AMD)
+ $(trilinos_enable sparse CSparse)
+ $(trilinos_enable sparse UMFPACK)
+ $(trilinos_enable superlu SuperLU)
+ $(trilinos_enable taucs)
+ $(trilinos_enable tbb)
+ $(trilinos_enable threads Pthread)
+ $(trilinos_enable tvmet)
+ $(trilinos_enable yaml yaml-cpp)
+ $(trilinos_enable zlib Zlib)
+ )
+
+ use eigen && \
+ mycmakeargs+=(
+ -DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
+ )
+ use hypre && \
+ mycmakeargs+=(
+ -DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
+ )
+ use scotch && \
+ mycmakeargs+=(
+ -DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
+ )
+
+ # cxsparse is a rewrite of csparse + extras
+ use sparse && \
+ mycmakeargs+=(
+ -DCSparse_LIBRARY_NAMES="cxsparse"
+ )
+
+ # mandatory blas and lapack
+ trilinos_conf blas BLAS
+ trilinos_conf lapack LAPACK
+ use superlu && trilinos_conf superlu SuperLU
+ use metis && trilinos_conf metis METIS
+
+ # blacs library is included in scalapack these days
+ if use scalapack; then
+ trilinos_conf scalapack SCALAPACK
+ mycmakeargs+=(
+ -DBLACS_LIBRARY_NAMES="scalapack"
+ -DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
+ )
+ fi
+
+ # TODO: do we need that line?
+ export CC=mpicc CXX=mpicxx && tc-export CC CXX
+
+ # cmake-utils eclass patches the base directory CMakeLists.txt
+ # which does not work for complex Trilinos CMake modules
+ CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
+
+ # TODO:
+ # python bindings with python-r1
+ # fix hypre bindings
+ # fix hdf5
+ # cuda/thrust is untested
+ # do we always need mpi? and for all packages: blah[mpi] ?
+ # install docs, examples
+ # see what packages are related, do we need REQUIRED_USE
+ # proper use flags description
+ # add more use flags/packages ?
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ # register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
+ # has a chance to pick up the libraries...
+ cat >> "${T}"/99trilinos <<- EOF
+ LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
+ EOF
+ doenvd "${T}"/99trilinos
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/
@ 2015-03-14 8:21 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2015-03-14 8:21 UTC (permalink / raw
To: gentoo-commits
commit: a3f515f117bad10a727444fcf6b2ceae29e15460
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 13 17:12:28 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 17:12:28 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=a3f515f1
sci-libs/trilinos: fix location of target config files
Package-Manager: portage-2.2.15
sci-libs/trilinos/ChangeLog | 9 +++++++++
sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch | 2 +-
sci-libs/trilinos/files/trilinos-11.14.1-fix-install-paths.patch | 2 +-
.../{trilinos-11.12.1.ebuild => trilinos-11.12.1-r1.ebuild} | 0
.../{trilinos-11.14.1.ebuild => trilinos-11.14.1-r1.ebuild} | 0
5 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index 1e694b5..b773567 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,15 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*trilinos-11.12.1-r1 (13 Mar 2015)
+*trilinos-11.14.1-r1 (13 Mar 2015)
+
+ 13 Mar 2015; Matthias Maier <tamiko@gentoo.org> +trilinos-11.12.1-r1.ebuild,
+ +trilinos-11.14.1-r1.ebuild, -trilinos-11.12.1.ebuild,
+ -trilinos-11.14.1.ebuild, files/trilinos-11.12.1-fix-install-paths.patch,
+ files/trilinos-11.14.1-fix-install-paths.patch:
+ sci-libs/trilinos: fix location of target config files
+
*trilinos-11.14.1 (13 Mar 2015)
13 Mar 2015; Matthias Maier <tamiko@gentoo.org>
diff --git a/sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch b/sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch
index 130f3ce..9a02292 100644
--- a/sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch
+++ b/sci-libs/trilinos/files/trilinos-11.12.1-fix-install-paths.patch
@@ -26,7 +26,7 @@ index e1c633f..864488f 100644
INSTALL(
EXPORT ${PACKAGE_NAME}
- DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}"
-+ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
++ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}"
FILE ${PACKAGE_NAME}Targets.cmake
)
ENDIF()
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
index acfe4bb..32f25f3 100644
--- 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
@@ -26,7 +26,7 @@ index e1c633f..864488f 100644
INSTALL(
EXPORT ${PACKAGE_NAME}
- DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}"
-+ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
++ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PACKAGE_NAME}"
FILE ${PACKAGE_NAME}Targets.cmake
)
ENDIF()
diff --git a/sci-libs/trilinos/trilinos-11.12.1.ebuild b/sci-libs/trilinos/trilinos-11.12.1-r1.ebuild
similarity index 100%
rename from sci-libs/trilinos/trilinos-11.12.1.ebuild
rename to sci-libs/trilinos/trilinos-11.12.1-r1.ebuild
diff --git a/sci-libs/trilinos/trilinos-11.14.1.ebuild b/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild
similarity index 100%
rename from sci-libs/trilinos/trilinos-11.14.1.ebuild
rename to sci-libs/trilinos/trilinos-11.14.1-r1.ebuild
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/
@ 2015-07-16 19:42 Jauhien Piatlicki
0 siblings, 0 replies; 11+ messages in thread
From: Jauhien Piatlicki @ 2015-07-16 19:42 UTC (permalink / raw
To: gentoo-commits
commit: ee9b4a37b7e726a35182f379fa0239f66a90401e
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 13 03:05:30 2015 +0000
Commit: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 03:05:30 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=ee9b4a37
sci-libs/trilinos: drop old; version bump
Package-Manager: portage-2.2.20
sci-libs/trilinos/ChangeLog | 9 +
.../files/trilinos-11.0.3-fix-install-paths.patch | 76 ---
.../files/trilinos-11.2.3-fix-install-paths.patch | 62 --
...inos-12.0.1-fix_install_paths_for_destdir.patch | 654 +++++++++++++++++++++
sci-libs/trilinos/trilinos-11.0.3.ebuild | 128 ----
sci-libs/trilinos/trilinos-11.2.3-r1.ebuild | 1 -
...ilinos-11.4.2.ebuild => trilinos-12.0.1.ebuild} | 15 +-
7 files changed, 673 insertions(+), 272 deletions(-)
diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index b773567..f5d1ce5 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,15 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*trilinos-12.0.1 (13 Jul 2015)
+
+ 13 Jul 2015; Matthias Maier <tamiko@gentoo.org>
+ +files/trilinos-12.0.1-fix_install_paths_for_destdir.patch,
+ +trilinos-12.0.1.ebuild, -files/trilinos-11.0.3-fix-install-paths.patch,
+ -files/trilinos-11.2.3-fix-install-paths.patch, -trilinos-11.0.3.ebuild,
+ -trilinos-11.2.3-r1.ebuild, -trilinos-11.4.2.ebuild:
+ sci-libs/trilinos: drop old; version bump
+
*trilinos-11.12.1-r1 (13 Mar 2015)
*trilinos-11.14.1-r1 (13 Mar 2015)
diff --git a/sci-libs/trilinos/files/trilinos-11.0.3-fix-install-paths.patch b/sci-libs/trilinos/files/trilinos-11.0.3-fix-install-paths.patch
deleted file mode 100644
index 8ec15a4..0000000
--- a/sci-libs/trilinos/files/trilinos-11.0.3-fix-install-paths.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- a/cmake/tribits/package_arch/TribitsGlobalMacros.cmake 2013-04-03 11:00:54.342539245 +0200
-+++ b/cmake/tribits/package_arch/TribitsGlobalMacros.cmake 2013-04-03 11:04:30.283837064 +0200
-@@ -209,26 +209,6 @@
- ADVANCED_SET(${PROJECT_NAME}_LINK_SEARCH_START_STATIC OFF CACHE BOOL
- "If on, then the properter LINK_SEARCH_START_STATIC will be added to all executables." )
- ENDIF()
--
-- ADVANCED_SET(${PROJECT_NAME}_INSTALL_INCLUDE_DIR "include"
-- CACHE PATH
-- "Location where the headers will be installed. If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}. If given as an absolute path, it will used as such. Default is 'include'"
-- )
--
-- ADVANCED_SET(${PROJECT_NAME}_INSTALL_LIB_DIR "lib"
-- CACHE PATH
-- "Location where the libraries will be installed. If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}. If given as an absolute path, it will used as such. Default is 'lib'"
-- )
--
-- ADVANCED_SET(${PROJECT_NAME}_INSTALL_RUNTIME_DIR "bin"
-- CACHE PATH
-- "Location where the runtime DLLs and designated programs will be installed. If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}. If given as an absolute path, it will used as such. Default is 'bin'"
-- )
--
-- ADVANCED_SET(${PROJECT_NAME}_INSTALL_EXAMPLE_DIR "example"
-- CACHE PATH
-- "Location where assorted examples will be installed. If given as a relative path, it will be relative to ${CMAKE_INSTALL_PREFIX}. If given as an absolute path, it will used as such. Default is 'example'"
-- )
-
- IF ("${${PROJECT_NAME}_INSTALL_LIBRARIES_AND_HEADERS_DEFAULT}" STREQUAL "")
- # Assume the TriBITS project wants to install headers and libraries by default
---- a/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake 2012-11-12 14:58:00.000000000 +0100
-+++ b/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake 2012-11-12 14:42:47.000000000 +0100
-@@ -367,7 +367,7 @@
-
- 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
- )
-
-@@ -563,7 +563,7 @@
- IF(HAS_INSTALL_TARGETS)
- INSTALL(
- EXPORT ${PROJECT_NAME}
-- DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
-+ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
- FILE ${PROJECT_NAME}Targets.cmake
- )
- # Import the targets in applications.
-@@ -589,7 +589,7 @@
-
- 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
- )
-
-@@ -632,7 +632,7 @@
-
- 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()
---- a/packages/fei/base/CMakeLists.txt 2012-11-12 14:05:18.000000000 +0100
-+++ b/packages/fei/base/CMakeLists.txt 2012-11-12 14:05:18.000000000 +0100
-@@ -54,5 +54,5 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/include)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-
diff --git a/sci-libs/trilinos/files/trilinos-11.2.3-fix-install-paths.patch b/sci-libs/trilinos/files/trilinos-11.2.3-fix-install-paths.patch
deleted file mode 100644
index 0118d6b..0000000
--- a/sci-libs/trilinos/files/trilinos-11.2.3-fix-install-paths.patch
+++ /dev/null
@@ -1,62 +0,0 @@
- IF ("${${PROJECT_NAME}_INSTALL_LIBRARIES_AND_HEADERS_DEFAULT}" STREQUAL "")
- # Assume the TriBITS project wants to install headers and libraries by default
---- a/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake 2012-11-12 14:58:00.000000000 +0100
-+++ b/cmake/tribits/package_arch/TribitsPackageWritePackageConfig.cmake 2012-11-12 14:42:47.000000000 +0100
-@@ -267,8 +267,8 @@
- # directories using the installed config file. This is to deal with
- # installers that allow relocation of the install tree at *install*
- # time.
-- SET(LIBRARY_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../${${PROJECT_NAME}_INSTALL_LIB_DIR}")
-- SET(INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
-+ SET(LIBRARY_DIRS "${${PROJECT_NAME}_INSTALL_LIB_DIR}")
-+ SET(INCLUDE_DIRS "${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
-
- # Custom code in configuration file.
- SET(PACKAGE_CONFIG_CODE "")
-@@ -297,7 +297,7 @@
-
- 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
- )
-
-@@ -477,8 +477,8 @@
- # directories using the installed config file. This is to deal with
- # installers that allow relocation of the install tree at *install*
- # time.
-- SET(${PROJECT_NAME}_CONFIG_INCLUDE_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}")
-- SET(${PROJECT_NAME}_CONFIG_LIBRARY_DIRS "\${CMAKE_CURRENT_LIST_DIR}/../../../${${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)
-@@ -493,7 +493,7 @@
- IF(HAS_INSTALL_TARGETS)
- INSTALL(
- EXPORT ${PROJECT_NAME}
-- DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PROJECT_NAME}"
-+ DESTINATION "${${PROJECT_NAME}_INSTALL_CONFIG_DIR}/${PROJECT_NAME}"
- FILE ${PROJECT_NAME}Targets.cmake
- )
- # Import the targets in applications.
-@@ -519,7 +519,7 @@
-
- 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
- )
-
-@@ -562,7 +562,7 @@
-
- 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.0.1-fix_install_paths_for_destdir.patch b/sci-libs/trilinos/files/trilinos-12.0.1-fix_install_paths_for_destdir.patch
new file mode 100644
index 0000000..cb08d26
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-12.0.1-fix_install_paths_for_destdir.patch
@@ -0,0 +1,654 @@
+diff --git a/commonTools/gtest/CMakeLists.txt b/commonTools/gtest/CMakeLists.txt
+index 9367010..17f8892 100644
+--- a/commonTools/gtest/CMakeLists.txt
++++ b/commonTools/gtest/CMakeLists.txt
+@@ -31,7 +31,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/kokkos/containers/src/CMakeLists.txt b/packages/kokkos/containers/src/CMakeLists.txt
+index da5a791..5693cdc 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 7daf4ec..1740fe6 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..f1e57ea 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/ioss/src/init/CMakeLists.txt b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt
+index 573c972..8056913 100644
+--- a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt
++++ b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt
+@@ -50,5 +50,5 @@ IF (BUILD_TESTING)
+ ENDIF (BUILD_TESTING)
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+- ${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/init/)
++ ${Trilinos_INSTALL_INCLUDE_DIR}/init/)
+
+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..8f2045c 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..c3cd3b4 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 ec7f650..a98b073 100644
+--- a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
+@@ -22,5 +22,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 e738def..e8ad166 100644
+--- a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
+@@ -47,4 +47,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 38d9b5c..7b1d105 100644
+--- a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
+@@ -50,7 +50,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 0412574..b15f54a 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
+@@ -46,4 +46,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 71c6697..770eb52 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
+@@ -55,7 +55,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 844088a..398640d 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
+@@ -49,5 +49,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 7162134..4738933 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
+@@ -55,4 +55,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..68b3533 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..fa854bc 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..6f2d965 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..e6f5344 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..b27238f 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..411ab23 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..2353f6c 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..3978bf5 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 90ab292..930279b 100644
+--- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
+@@ -47,4 +47,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 2582b19..2f35d7a 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
+@@ -19,4 +19,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 a70b0b8..3f8d6ac 100644
+--- a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
+@@ -63,4 +63,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 55a388e..9a5cbfb 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
+@@ -35,5 +35,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 33de7e0..d904256 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
+@@ -55,4 +55,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..c00793d 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 105822f..f232e2c 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
+@@ -83,5 +83,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 0493a45..6e5673c 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
+@@ -81,4 +81,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 f441b60..e64f34d 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
+@@ -62,4 +62,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 174a0bb..3827f7f 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
+@@ -51,4 +51,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 ed25e41..9314e7a 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
+@@ -50,4 +50,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 56b7873..8d83357 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
+@@ -47,4 +47,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 467dfa1..605aefd 100644
+--- a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
++++ b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
+@@ -78,4 +78,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 1cc9609..16e1fe0 100644
+--- a/packages/stk/stk_io/stk_io/CMakeLists.txt
++++ b/packages/stk/stk_io/stk_io/CMakeLists.txt
+@@ -80,7 +80,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 beee08b..1d78255 100644
+--- a/packages/stk/stk_io/stk_io/util/CMakeLists.txt
++++ b/packages/stk/stk_io/stk_io/util/CMakeLists.txt
+@@ -77,4 +77,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 5db69c1..9e60c2e 100644
+--- a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
++++ b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
+@@ -80,7 +80,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_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+index 164e07c..99411b6 100644
+--- a/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
++++ b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+@@ -72,4 +72,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_search/stk_search/CMakeLists.txt b/packages/stk/stk_search/stk_search/CMakeLists.txt
+index ae6cc04..199c82f 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..dd460d4 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_topology/stk_topology/CMakeLists.txt b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
+index 7364267..f1d03d3 100644
+--- a/packages/stk/stk_topology/stk_topology/CMakeLists.txt
++++ b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
+@@ -72,7 +72,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 667cb5d..ce11394 100644
+--- a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
++++ b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
+@@ -5,4 +5,4 @@
+ FILE(GLOB HEADERS *.hpp)
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
+diff --git a/packages/stk/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_util/stk_util/CMakeLists.txt
+index 02f4bf2..e95b05c 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 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 32115b6..184062a 100644
+--- a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
+@@ -76,5 +76,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 f3ecc5d..8268018 100644
+--- a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
+@@ -74,4 +74,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 51e11fd..dba3e15 100644
+--- a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
+@@ -93,4 +93,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 2fa8a9b..dbc5000 100644
+--- a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
+@@ -71,5 +71,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 4a39491..ed521a4 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
+@@ -79,4 +79,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 b12d75e..054f60d 100644
+--- a/packages/stk/stk_util/stk_util/util/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/util/CMakeLists.txt
+@@ -76,4 +76,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/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 c312433..8a52ec4 100644
+--- a/packages/zoltan/src/CMakeLists.txt
++++ b/packages/zoltan/src/CMakeLists.txt
+@@ -678,5 +678,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 64345d3..e60c2e3 100644
+--- a/packages/zoltan/src/fdriver/CMakeLists.txt
++++ b/packages/zoltan/src/fdriver/CMakeLists.txt
+@@ -35,6 +35,6 @@ TRIBITS_ADD_EXECUTABLE(
+
+ # 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/rol/adapters/belos/src/CMakeLists.txt b/packages/rol/adapters/belos/src/CMakeLists.txt
+index 7672258..b844022 100644
+--- a/packages/rol/adapters/belos/src/CMakeLists.txt
++++ b/packages/rol/adapters/belos/src/CMakeLists.txt
+@@ -40,4 +40,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 b5f2416..2d251dc 100644
+--- a/packages/rol/adapters/epetra/src/CMakeLists.txt
++++ b/packages/rol/adapters/epetra/src/CMakeLists.txt
+@@ -37,4 +37,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/sacado/src/CMakeLists.txt b/packages/rol/adapters/sacado/src/CMakeLists.txt
+index 7366185..c186c70 100644
+--- a/packages/rol/adapters/sacado/src/CMakeLists.txt
++++ b/packages/rol/adapters/sacado/src/CMakeLists.txt
+@@ -38,4 +38,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/thyra/src/CMakeLists.txt b/packages/rol/adapters/thyra/src/CMakeLists.txt
+index 32172f2..5956c01 100644
+--- a/packages/rol/adapters/thyra/src/CMakeLists.txt
++++ b/packages/rol/adapters/thyra/src/CMakeLists.txt
+@@ -50,4 +50,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 51c2e92..1b9eab1 100644
+--- a/packages/rol/adapters/tpetra/src/CMakeLists.txt
++++ b/packages/rol/adapters/tpetra/src/CMakeLists.txt
+@@ -39,4 +39,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/sci-libs/trilinos/trilinos-11.0.3.ebuild b/sci-libs/trilinos/trilinos-11.0.3.ebuild
deleted file mode 100644
index 7075a10..0000000
--- a/sci-libs/trilinos/trilinos-11.0.3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit cmake-utils 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"
-SRC_PAGE="11.0"
-
-SLOT="0"
-LICENSE="BSD LGPL-2.1"
-KEYWORDS="~amd64 ~x86"
-IUSE="arprec boost cuda hdf5 hwloc netcdf qd qt4 scotch taucs tbb test umfpack zlib"
-
-RDEPEND="
- virtual/blas
- virtual/lapack
- virtual/mpi
- >=sci-libs/scalapack-2
- arprec? ( sci-libs/arprec )
- boost? ( dev-libs/boost )
- cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
- hdf5? ( sci-libs/hdf5[mpi] )
- hwloc? ( sys-apps/hwloc )
- netcdf? ( sci-libs/netcdf )
- qd? ( sci-libs/qd )
- qt4? ( dev-qt/qtgui:4 )
- scotch? ( sci-libs/scotch[mpi] )
- taucs? ( sci-libs/taucs )
- tbb? ( dev-cpp/tbb )
- umfpack? ( sci-libs/umfpack )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${P}-Source"
-
-pkg_nofetch() {
- einfo "Sandia requires that you register to the site in order to download Trilinos."
- einfo "Please download ${SRC_URI} from:"
- einfo "http://trilinos.sandia.gov/download/trilinos-${SRC_PAGE}.html"
- einfo "and move it to ${DISTDIR}"
-}
-
-function trilinos_alternatives {
- alt_dirs=""
- for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
- alt_dirs="${alt_dirs};${d:2}"
- done
- arg="-D${2}_LIBRARY_DIRS=${alt_dirs:1}"
- mycmakeargs+=(
- $arg
- )
-
- alt_libs=""
- for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
- alt_libs="${alt_libs};${d:2}"
- done
- arg="-D${2}_LIBRARY_NAMES=${alt_libs:1}"
- mycmakeargs+=(
- $arg
- )
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-fix-install-paths.patch
-}
-
-src_configure() {
- CMAKE_BUILD_TYPE="release"
-
- mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -DTrilinos_ENABLE_ALL_PACKAGES=ON
-
- -DTrilinos_INSTALL_BIN_DIR="bin"
- -DTrilinos_INSTALL_CONFIG_DIR="$(get_libdir)/cmake"
- -DTrilinos_INSTALL_INCLUDE_DIR="include/trilinos"
- -DTrilinos_INSTALL_LIB_DIR="$(get_libdir)"
- -DTrilinos_INSTALL_EXAMPLE_DIR="share/trilinos/example"
-
- # Tests
- $(cmake-utils_use test Trilinos_ENABLE_TESTS)
-
- # Mandatory dependencies
- -DTPL_ENABLE_BinUtils=ON
- -DTPL_ENABLE_MPI=ON
- -DTPL_ENABLE_BLAS=ON
- -DTPL_ENABLE_LAPACK=ON
- -DTPL_ENABLE_BLACS=ON
- -DTPL_ENABLE_SCALAPACK=ON
- -DTrilinos_EXTRA_LINK_FLAGS="-lmpi -lmpi_cxx"
-
- # Optional dependencies
- $(cmake-utils_use arprec TPL_ENABLE_ARPREC)
- $(cmake-utils_use boost TPL_ENABLE_Boost)
- $(cmake-utils_use boost TPL_ENABLE_BoostLib)
- $(cmake-utils_use cuda TPL_ENABLE_CUDA)
- $(cmake-utils_use hdf5 TPL_ENABLE_HDF5)
- $(cmake-utils_use hwloc TPL_ENABLE_HWLOC)
- $(cmake-utils_use netcdf TPL_ENABLE_Netcdf)
- $(cmake-utils_use qd TPL_ENABLE_QD)
- $(cmake-utils_use qt4 TPL_ENABLE_QT)
- $(cmake-utils_use scotch TPL_ENABLE_Scotch)
- $(cmake-utils_use taucs TPL_ENABLE_TAUCS)
- $(cmake-utils_use tbb TPL_ENABLE_TBB)
- $(cmake-utils_use umfpack TPL_ENABLE_UMFPACK)
- $(cmake-utils_use zlib TPL_ENABLE_Zlib)
- )
-
- # Scotch libraries
- if use scotch; then
- mycmakeargs+=( -DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch" )
- fi
-
- # Add BLAS libraries
- trilinos_alternatives blas BLAS
- trilinos_alternatives lapack LAPACK
- trilinos_alternatives scalapack SCALAPACK
- trilinos_alternatives scalapack BLACS
-
- mycmakeargs+=( -DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs" )
-
- cmake-utils_src_configure
-}
diff --git a/sci-libs/trilinos/trilinos-11.2.3-r1.ebuild b/sci-libs/trilinos/trilinos-11.2.3-r1.ebuild
deleted file mode 120000
index 0b4d819..0000000
--- a/sci-libs/trilinos/trilinos-11.2.3-r1.ebuild
+++ /dev/null
@@ -1 +0,0 @@
-trilinos-11.4.2.ebuild
\ No newline at end of file
diff --git a/sci-libs/trilinos/trilinos-11.4.2.ebuild b/sci-libs/trilinos/trilinos-12.0.1.ebuild
similarity index 91%
rename from sci-libs/trilinos/trilinos-11.4.2.ebuild
rename to sci-libs/trilinos/trilinos-12.0.1.ebuild
index 237bcf4..d7bc5b1 100644
--- a/sci-libs/trilinos/trilinos-11.4.2.ebuild
+++ b/sci-libs/trilinos/trilinos-12.0.1.ebuild
@@ -16,10 +16,9 @@ LICENSE="BSD LGPL-2.1"
SLOT="0"
IUSE="
- adolc arprec boost clp cppunit cuda eigen glpk gtest
- hdf5 hwloc hypre metis mkl mumps netcdf petsc qd qt4
- scalapack scotch sparse superlu taucs tbb test threads
- tvmet yaml zlib
+ adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre
+ matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse
+ superlu taucs tbb test threads tvmet yaml zlib
"
# TODO: fix export cmake function for tests
@@ -39,6 +38,7 @@ RDEPEND="
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 )
@@ -82,15 +82,19 @@ trilinos_enable() {
}
src_prepare() {
- epatch "${FILESDIR}"/${P}-fix-install-paths.patch
+ epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch
+ epatch "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch
}
src_configure() {
+ # temporarily disable SEACAS and pyTrilinos compilation
local mycmakeargs=(
-DBUILD_SHARED_LIBS=ON
-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
-DTrilinos_ENABLE_ALL_PACKAGES=ON
+ -DTrilinos_ENABLE_SEACAS=OFF
+ -DTrilinos_ENABLE_PyTrilinos=OFF
-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
@@ -114,6 +118,7 @@ src_configure() {
$(trilinos_enable hdf5)
$(trilinos_enable hwloc)
$(trilinos_enable hypre)
+ $(trilinos_enable matio)
$(trilinos_enable metis)
$(trilinos_enable mkl)
$(trilinos_enable mkl PARDISO_MKL)
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/
@ 2015-08-28 11:14 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2015-08-28 11:14 UTC (permalink / raw
To: gentoo-commits
commit: 7c08fa53726b7d30ddb14525596a1ca468007fc3
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 20:36:32 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 20:36:32 2015 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7c08fa53
sci-libs/trilinos: compilation fixes for 12.2.1
Package-Manager: portage-2.2.20.1
sci-libs/trilinos/ChangeLog | 4 ++
.../files/trilinos-12.2.1-compilation_fixes.patch | 43 ++++++++++++++++++++++
sci-libs/trilinos/trilinos-12.2.1.ebuild | 5 ++-
3 files changed, 50 insertions(+), 2 deletions(-)
diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index 4957c5c..1aabfdf 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Id$
+ 27 Aug 2015; Matthias Maier <tamiko@gentoo.org>
+ +files/trilinos-12.2.1-compilation_fixes.patch, trilinos-12.2.1.ebuild:
+ sci-libs/trilinos: compilation fixes for 12.2.1
+
*trilinos-12.2.1 (27 Aug 2015)
27 Aug 2015; Matthias Maier <tamiko@gentoo.org> +trilinos-12.2.1.ebuild:
diff --git a/sci-libs/trilinos/files/trilinos-12.2.1-compilation_fixes.patch b/sci-libs/trilinos/files/trilinos-12.2.1-compilation_fixes.patch
new file mode 100644
index 0000000..a77a8dc
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-12.2.1-compilation_fixes.patch
@@ -0,0 +1,43 @@
+diff --git a/packages/fei/test_utils/snl_fei_tester.cpp b/packages/fei/test_utils/snl_fei_tester.cpp
+index 0ebfa9d..17278ee 100644
+--- a/packages/fei/test_utils/snl_fei_tester.cpp
++++ b/packages/fei/test_utils/snl_fei_tester.cpp
+@@ -523,7 +523,7 @@ int snl_fei_tester::save_block_node_soln(DataReader& data, fei::Vector* vec,
+ FEI_OFSTREAM outfile(str.c_str());
+
+ if (!outfile || outfile.bad()) {
+- fei::console_out() << "ERROR opening solution output file " << fileName << FEI_ENDL;
++ fei::console_out() << "ERROR opening solution output file " << fileName.str() << FEI_ENDL;
+ return(-1);
+ }
+
+@@ -591,7 +591,7 @@ int snl_fei_tester::save_block_elem_soln(DataReader& data, fei::Vector* vec,
+ FEI_OFSTREAM outfile(str.c_str());
+
+ if (!outfile || outfile.bad()) {
+- fei::console_out() << "ERROR opening solution output file " << fileName << FEI_ENDL;
++ fei::console_out() << "ERROR opening solution output file " << fileName.str() << FEI_ENDL;
+ return(-1);
+ }
+
+@@ -668,7 +668,7 @@ int snl_fei_tester::save_multiplier_soln(DataReader& data, fei::Vector* vec,
+ FEI_OFSTREAM outfile(str.c_str());
+
+ if (!outfile || outfile.bad()) {
+- fei::console_out() << "ERROR opening solution output file " << fileName << FEI_ENDL;
++ fei::console_out() << "ERROR opening solution output file " << fileName.str() << FEI_ENDL;
+ return(-1);
+ }
+
+diff --git a/packages/ifpack/src/Ifpack_Hypre.cpp b/packages/ifpack/src/Ifpack_Hypre.cpp
+index ea6ba35..26a1281 100644
+--- a/packages/ifpack/src/Ifpack_Hypre.cpp
++++ b/packages/ifpack/src/Ifpack_Hypre.cpp
+@@ -51,6 +51,7 @@
+
+ using Teuchos::RCP;
+ using Teuchos::rcp;
++using std::endl;
+
+ Ifpack_Hypre::Ifpack_Hypre(Epetra_RowMatrix* A):
+ A_(rcp(A,false)),
diff --git a/sci-libs/trilinos/trilinos-12.2.1.ebuild b/sci-libs/trilinos/trilinos-12.2.1.ebuild
index b090b96..5862e73 100644
--- a/sci-libs/trilinos/trilinos-12.2.1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.2.1.ebuild
@@ -82,8 +82,9 @@ trilinos_enable() {
}
src_prepare() {
- epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch
- epatch "${FILESDIR}"/${PN}-12.0.1-fix_install_paths_for_destdir.patch
+ epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
+ "${FILESDIR}"/${PN}-12.0.1-fix_install_paths_for_destdir.patch \
+ "${FILESDIR}"/${P}-compilation_fixes.patch
}
src_configure() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/
@ 2017-07-14 18:20 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2017-07-14 18:20 UTC (permalink / raw
To: gentoo-commits
commit: 29c5e3f5de195abd749fb096f476cf833c0cb08a
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 18:20:23 2017 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 18:20:23 2017 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=29c5e3f5
sci-libs/trilinos: fix compilation with gcc-7
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../files/trilinos-12.10.1-fix_gcc_7.patch | 57 ++++++++++++++++++++++
sci-libs/trilinos/trilinos-12.10.1-r1.ebuild | 3 +-
2 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch b/sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch
new file mode 100644
index 000000000..cb005cbd3
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch
@@ -0,0 +1,57 @@
+diff --git a/packages/stk/stk_util/stk_util/diag/StringUtil.cpp b/packages/stk/stk_util/stk_util/diag/StringUtil.cpp
+index eb9c7c1..942cfad 100644
+--- a/packages/stk/stk_util/stk_util/diag/StringUtil.cpp
++++ b/packages/stk/stk_util/stk_util/diag/StringUtil.cpp
+@@ -40,7 +40,7 @@
+ #include <string> // for basic_string, string, etc
+ #include "stk_util/diag/String.hpp" // for String
+
+-#if __GNUC__ == 3 || __GNUC__ == 4 || __GNUC__ == 5 || __GNUC__ == 6
++#if __GNUC__ == 3 || __GNUC__ == 4 || __GNUC__ == 5 || __GNUC__ == 6 || __GNUC__ == 7
+ #include <cxxabi.h>
+ #endif
+
+@@ -314,7 +314,7 @@ word_wrap(
+ #endif
+ }
+
+- #elif (__GNUC__ == 5)
++ #elif (__GNUC__ >= 5)
+ std::string
+ demangle(const char * symbol)
+ {
+@@ -338,33 +338,8 @@ word_wrap(
+ return s;
+ #endif
+ }
+-
+- #elif (__GNUC__ == 6)
+- std::string
+- demangle(const char * symbol)
+- {
+- #ifdef PURIFY_BUILD
+- return symbol;
+- #else
+- std::string s;
+-
+- int status = -1;
+-
+- char *demangled_symbol = abi::__cxa_demangle(symbol, 0, 0, &status);
+
+- if (demangled_symbol) {
+- s = std::string(demangled_symbol);
+- free(demangled_symbol);
+- }
+-
+- if (status != 0)
+- s = std::string(symbol);
+-
+- return s;
+- #endif
+- }
+-
+- #endif // (__GNUC__ == 3)
++ #endif
+
+ #else
+
diff --git a/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild b/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild
index f577e1f5d..b43aabad7 100644
--- a/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild
@@ -85,7 +85,8 @@ trilinos_enable() {
src_prepare() {
epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
"${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch \
- "${FILESDIR}"/${P}-fix_install_paths_for_destdir-2.patch
+ "${FILESDIR}"/${P}-fix_install_paths_for_destdir-2.patch \
+ "${FILESDIR}"/${P}-fix_gcc_7.patch
epatch_user
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/
@ 2018-04-02 12:45 Justin Lecher
0 siblings, 0 replies; 11+ messages in thread
From: Justin Lecher @ 2018-04-02 12:45 UTC (permalink / raw
To: gentoo-commits
commit: 7185e731bd07735474852ee3669ddc764ef6e7e2
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 2 12:42:39 2018 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Apr 2 12:45:22 2018 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7185e731
sci-libs/trilinos: Drop old
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
Package-Manager: Portage-2.3.27, Repoman-2.3.9
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
...nos-11.14.1-fix_install_paths_for_destdir.patch | 617 ---------------------
.../files/trilinos-12.10.1-fix_gcc_7.patch | 57 --
...s-12.10.1-fix_install_paths_for_destdir-2.patch | 10 -
...nos-12.10.1-fix_install_paths_for_destdir.patch | 603 --------------------
sci-libs/trilinos/trilinos-11.14.1-r1.ebuild | 207 -------
sci-libs/trilinos/trilinos-12.10.1-r1.ebuild | 220 --------
6 files changed, 1714 deletions(-)
diff --git a/sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch b/sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch
deleted file mode 100644
index e24fc495b..000000000
--- a/sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch
+++ /dev/null
@@ -1,617 +0,0 @@
-diff --git a/commonTools/gtest/CMakeLists.txt b/commonTools/gtest/CMakeLists.txt
-index 9367010..17f8892 100644
---- a/commonTools/gtest/CMakeLists.txt
-+++ b/commonTools/gtest/CMakeLists.txt
-@@ -31,7 +31,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/kokkos/TPL/CMakeLists.txt b/packages/kokkos/TPL/CMakeLists.txt
-index 8119c31..2d74336 100644
---- a/packages/kokkos/TPL/CMakeLists.txt
-+++ b/packages/kokkos/TPL/CMakeLists.txt
-@@ -1,7 +1,7 @@
-
- TRIBITS_SUBPACKAGE(TPL)
-
--SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-
- IF( Kokkos_ENABLE_Cuda )
-
-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 7e0e150..d1ed33a 100644
---- a/packages/kokkos/core/src/CMakeLists.txt
-+++ b/packages/kokkos/core/src/CMakeLists.txt
-@@ -13,7 +13,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/ioss/src/init/CMakeLists.txt b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt
-index 573c972..8056913 100644
---- a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt
-+++ b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt
-@@ -50,5 +50,5 @@ IF (BUILD_TESTING)
- ENDIF (BUILD_TESTING)
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/init/)
-+ ${Trilinos_INSTALL_INCLUDE_DIR}/init/)
-
-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..8f2045c 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..c3cd3b4 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 ec7f650..a98b073 100644
---- a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
-@@ -22,5 +22,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 e738def..e8ad166 100644
---- a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
-@@ -47,4 +47,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 38d9b5c..7b1d105 100644
---- a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
-@@ -50,7 +50,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 0412574..b15f54a 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
-@@ -46,4 +46,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 71c6697..770eb52 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
-@@ -55,7 +55,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 844088a..398640d 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
-@@ -49,5 +49,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 7162134..4738933 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
-@@ -55,4 +55,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..68b3533 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..fa854bc 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..6f2d965 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..e6f5344 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..b27238f 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..411ab23 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..2353f6c 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..3978bf5 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 90ab292..930279b 100644
---- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
-@@ -47,4 +47,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 2582b19..2f35d7a 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
-@@ -19,4 +19,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 a70b0b8..3f8d6ac 100644
---- a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
-+++ b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
-@@ -63,4 +63,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 55a388e..9a5cbfb 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
-@@ -35,5 +35,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 33de7e0..d904256 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
-@@ -55,4 +55,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..c00793d 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 354b70c..5b8ec85 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
-@@ -83,5 +83,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 3d295e3..aa5869c 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
-@@ -81,4 +81,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 f441b60..e64f34d 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
-@@ -62,4 +62,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 11fb404..b2225e3 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
-@@ -51,4 +51,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 ed25e41..9314e7a 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
-@@ -50,4 +50,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 56b7873..8d83357 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
-@@ -47,4 +47,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 467dfa1..605aefd 100644
---- a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
-+++ b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
-@@ -78,4 +78,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 1cc9609..16e1fe0 100644
---- a/packages/stk/stk_io/stk_io/CMakeLists.txt
-+++ b/packages/stk/stk_io/stk_io/CMakeLists.txt
-@@ -80,7 +80,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 beee08b..1d78255 100644
---- a/packages/stk/stk_io/stk_io/util/CMakeLists.txt
-+++ b/packages/stk/stk_io/stk_io/util/CMakeLists.txt
-@@ -77,4 +77,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 5db69c1..9e60c2e 100644
---- a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
-+++ b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
-@@ -80,7 +80,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_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-index f28c06c..c5e817e 100644
---- a/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-+++ b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-@@ -72,4 +72,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_search/stk_search/CMakeLists.txt b/packages/stk/stk_search/stk_search/CMakeLists.txt
-index ae6cc04..199c82f 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..dd460d4 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_topology/stk_topology/CMakeLists.txt b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
-index 7364267..f1d03d3 100644
---- a/packages/stk/stk_topology/stk_topology/CMakeLists.txt
-+++ b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
-@@ -72,7 +72,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 667cb5d..ce11394 100644
---- a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
-+++ b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
-@@ -5,4 +5,4 @@
- FILE(GLOB HEADERS *.hpp)
-
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
-diff --git a/packages/stk/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_util/stk_util/CMakeLists.txt
-index 02f4bf2..e95b05c 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 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 32115b6..184062a 100644
---- a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
-@@ -76,5 +76,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 f3ecc5d..8268018 100644
---- a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
-@@ -74,4 +74,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 51e11fd..dba3e15 100644
---- a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
-@@ -93,4 +93,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 2fa8a9b..dbc5000 100644
---- a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
-@@ -71,5 +71,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 4a39491..ed521a4 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
-@@ -79,4 +79,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 b12d75e..054f60d 100644
---- a/packages/stk/stk_util/stk_util/util/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/util/CMakeLists.txt
-@@ -76,4 +76,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 44e6593..7048850 100644
---- a/packages/teuchos/kokkoscompat/src/CMakeLists.txt
-+++ b/packages/teuchos/kokkoscompat/src/CMakeLists.txt
-@@ -35,7 +35,7 @@ ENDIF()
- # 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 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 c312433..8a52ec4 100644
---- a/packages/zoltan/src/CMakeLists.txt
-+++ b/packages/zoltan/src/CMakeLists.txt
-@@ -678,5 +678,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 64345d3..e60c2e3 100644
---- a/packages/zoltan/src/fdriver/CMakeLists.txt
-+++ b/packages/zoltan/src/fdriver/CMakeLists.txt
-@@ -35,6 +35,6 @@ TRIBITS_ADD_EXECUTABLE(
-
- # 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/files/trilinos-12.10.1-fix_gcc_7.patch b/sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch
deleted file mode 100644
index cb005cbd3..000000000
--- a/sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/packages/stk/stk_util/stk_util/diag/StringUtil.cpp b/packages/stk/stk_util/stk_util/diag/StringUtil.cpp
-index eb9c7c1..942cfad 100644
---- a/packages/stk/stk_util/stk_util/diag/StringUtil.cpp
-+++ b/packages/stk/stk_util/stk_util/diag/StringUtil.cpp
-@@ -40,7 +40,7 @@
- #include <string> // for basic_string, string, etc
- #include "stk_util/diag/String.hpp" // for String
-
--#if __GNUC__ == 3 || __GNUC__ == 4 || __GNUC__ == 5 || __GNUC__ == 6
-+#if __GNUC__ == 3 || __GNUC__ == 4 || __GNUC__ == 5 || __GNUC__ == 6 || __GNUC__ == 7
- #include <cxxabi.h>
- #endif
-
-@@ -314,7 +314,7 @@ word_wrap(
- #endif
- }
-
-- #elif (__GNUC__ == 5)
-+ #elif (__GNUC__ >= 5)
- std::string
- demangle(const char * symbol)
- {
-@@ -338,33 +338,8 @@ word_wrap(
- return s;
- #endif
- }
--
-- #elif (__GNUC__ == 6)
-- std::string
-- demangle(const char * symbol)
-- {
-- #ifdef PURIFY_BUILD
-- return symbol;
-- #else
-- std::string s;
--
-- int status = -1;
--
-- char *demangled_symbol = abi::__cxa_demangle(symbol, 0, 0, &status);
-
-- if (demangled_symbol) {
-- s = std::string(demangled_symbol);
-- free(demangled_symbol);
-- }
--
-- if (status != 0)
-- s = std::string(symbol);
--
-- return s;
-- #endif
-- }
--
-- #endif // (__GNUC__ == 3)
-+ #endif
-
- #else
-
diff --git a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch
deleted file mode 100644
index 52ddc7669..000000000
--- a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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 8f9fa8f..e57d25f 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_mesh/fixtures/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
diff --git a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch
deleted file mode 100644
index 2e8960e23..000000000
--- a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch
+++ /dev/null
@@ -1,603 +0,0 @@
-diff -Naur trilinos-12.10.1-Source.orig/commonTools/gtest/CMakeLists.txt trilinos-12.10.1-Source/commonTools/gtest/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/commonTools/gtest/CMakeLists.txt 2016-12-05 13:46:36.981584433 -0700
-+++ trilinos-12.10.1-Source/commonTools/gtest/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -31,7 +31,7 @@
- )
-
- #install gtest header into the correct subdir.
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
-+INSTALL(FILES ${HEADERS} DESTINATION ${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
-
-
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/kokkos/containers/src/CMakeLists.txt trilinos-12.10.1-Source/packages/kokkos/containers/src/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/kokkos/containers/src/CMakeLists.txt 2016-12-05 13:46:37.071535392 -0700
-+++ trilinos-12.10.1-Source/packages/kokkos/containers/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -15,7 +15,7 @@
- FILE(GLOB HEADERS_IMPL impl/*.hpp)
- FILE(GLOB SOURCES impl/*.cpp)
-
--SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-
- INSTALL(FILES ${HEADERS_IMPL} DESTINATION ${TRILINOS_INCDIR}/impl/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/kokkos/core/src/CMakeLists.txt trilinos-12.10.1-Source/packages/kokkos/core/src/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/kokkos/core/src/CMakeLists.txt 2016-12-05 13:46:37.061540841 -0700
-+++ trilinos-12.10.1-Source/packages/kokkos/core/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -40,7 +40,7 @@
-
- #-----------------------------------------------------------------------------
-
--SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-
- #-----------------------------------------------------------------------------
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/kokkos/core/src/impl/CMakeLists.txt trilinos-12.10.1-Source/packages/kokkos/core/src/impl/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/kokkos/core/src/impl/CMakeLists.txt 2016-12-05 13:46:37.061540841 -0700
-+++ trilinos-12.10.1-Source/packages/kokkos/core/src/impl/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -12,7 +12,7 @@
- DEPLIBS
- )
-
--SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-
- INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/impl/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/belos/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/belos/src/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/rol/adapters/belos/src/CMakeLists.txt 2016-12-05 13:46:37.111513596 -0700
-+++ trilinos-12.10.1-Source/packages/rol/adapters/belos/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -39,4 +39,4 @@
- )
- ENDIF()
-
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/epetra/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/epetra/src/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/rol/adapters/epetra/src/CMakeLists.txt 2016-12-05 13:46:37.111513596 -0700
-+++ trilinos-12.10.1-Source/packages/rol/adapters/epetra/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -42,4 +42,4 @@
- )
- ENDIF()
-
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/sacado/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/sacado/src/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/rol/adapters/sacado/src/CMakeLists.txt 2016-12-05 13:46:37.101519046 -0700
-+++ trilinos-12.10.1-Source/packages/rol/adapters/sacado/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -37,4 +37,4 @@
- )
- ENDIF()
-
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/teuchos/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/teuchos/src/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/rol/adapters/teuchos/src/CMakeLists.txt 2016-12-05 13:46:37.101519046 -0700
-+++ trilinos-12.10.1-Source/packages/rol/adapters/teuchos/src/CMakeLists.txt 2016-12-05 14:37:03.361602958 -0700
-@@ -35,4 +35,4 @@
- )
-
-
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/thyra/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/thyra/src/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/rol/adapters/thyra/src/CMakeLists.txt 2016-12-05 13:46:37.111513596 -0700
-+++ trilinos-12.10.1-Source/packages/rol/adapters/thyra/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -49,4 +49,4 @@
- )
- ENDIF()
-
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/tpetra/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/tpetra/src/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/rol/adapters/tpetra/src/CMakeLists.txt 2016-12-05 13:46:37.111513596 -0700
-+++ trilinos-12.10.1-Source/packages/rol/adapters/tpetra/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -46,4 +46,4 @@
- )
- ENDIF()
-
--INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -46,7 +46,7 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/)
-
- ADD_SUBDIRECTORY(main)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -34,5 +34,5 @@
-
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -21,5 +21,5 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -46,4 +46,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -49,7 +49,7 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
-
- # AGS: I moved this to the bottom so that the link order was correct
- # with -lstk_io_uti before -lstk_io. I think the DEPLIBS added in
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -45,4 +45,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -54,7 +54,7 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
-
- INSTALL(FILES ${HEADERS_IMPL} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -48,5 +48,5 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -54,4 +54,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -68,5 +68,5 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -35,5 +35,5 @@
-
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -37,5 +37,5 @@
-
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -36,5 +36,5 @@
-
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -35,5 +35,5 @@
-
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700
-@@ -35,5 +35,5 @@
-
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -35,5 +35,5 @@
-
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -35,5 +35,5 @@
-
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -46,4 +46,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -18,4 +18,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -62,4 +62,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -34,5 +34,5 @@
-
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -54,4 +54,4 @@
- )
-
- #INSTALL(FILES ${HEADERS} DESTINATION
--# ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-+# ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -16,6 +16,6 @@
- TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
-
- INSTALL(FILES stk_config.h DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STKClassic_config.h DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -82,5 +82,5 @@
-
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -80,4 +80,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -61,4 +61,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -50,4 +50,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -49,4 +49,4 @@
- )
-
- #INSTALL(FILES ${HEADERS} DESTINATION
--# ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/)
-+# ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -46,4 +46,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -77,4 +77,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -78,7 +78,7 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
-
- # AGS: I moved this to the bottom so that the link order was correct
- # with -lstk_io_uti before -lstk_io. I think the DEPLIBS added in
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/util/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/util/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -76,4 +76,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2016-12-05 13:46:37.421344676 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -84,14 +84,13 @@
- TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
-
- INSTALL(FILES ${HEADERS_IMPL} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
-
- INSTALL(FILES ${HEADERS_ELEMGRAPH} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph)
-
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
--
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt 2016-12-05 13:46:37.421344676 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -71,4 +71,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_search/stk_search/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_search/stk_search/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_search/stk_search/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_search/stk_search/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -69,4 +69,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt 2016-12-05 13:46:37.431339227 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -68,5 +68,5 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_topology/stk_topology/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_topology/stk_topology/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_topology/stk_topology/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_topology/stk_topology/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -71,7 +71,7 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/)
-
- INSTALL(FILES ${DETAIL_HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt 2016-12-05 13:46:37.431339227 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -5,4 +5,4 @@
- FILE(GLOB HEADERS *.hpp)
-
- INSTALL(FILES ${HEADERS} DESTINATION
--${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
-+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/CMakeLists.txt 2016-12-05 13:56:03.782564712 -0700
-@@ -18,6 +18,6 @@
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
-
- INSTALL(FILES stk_config.h stk_kokkos_macros.h DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STK_Trilinos_config.h DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -75,5 +75,5 @@
-
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -73,4 +73,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -92,4 +92,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/registry/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/registry/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/registry/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -70,5 +70,5 @@
-
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -78,4 +78,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/util/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700
-+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -75,4 +75,4 @@
- )
-
- INSTALL(FILES ${HEADERS} DESTINATION
-- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
-+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
-diff -Naur trilinos-12.10.1-Source.orig/packages/teuchos/kokkoscompat/src/CMakeLists.txt trilinos-12.10.1-Source/packages/teuchos/kokkoscompat/src/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/teuchos/kokkoscompat/src/CMakeLists.txt 2016-12-05 13:46:37.371371921 -0700
-+++ trilinos-12.10.1-Source/packages/teuchos/kokkoscompat/src/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -27,7 +27,7 @@
- # FIXME (mfh 19 Dec 2014) We should rely on TriBITS to handle
- # installation.
-
--SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
-
- INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/trios/libraries/support/CMakeLists.txt trilinos-12.10.1-Source/packages/trios/libraries/support/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/trios/libraries/support/CMakeLists.txt 2016-12-05 13:46:37.531284737 -0700
-+++ trilinos-12.10.1-Source/packages/trios/libraries/support/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -168,6 +168,6 @@
-
- ########### install targets ###############
-
--# INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-+# INSTALL(FILES ${MODULES} DESTINATION include)
-
- TRIBITS_SUBPACKAGE_POSTPROCESS()
-diff -Naur trilinos-12.10.1-Source.orig/packages/zoltan/src/CMakeLists.txt trilinos-12.10.1-Source/packages/zoltan/src/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/zoltan/src/CMakeLists.txt 2016-12-05 13:46:37.231448208 -0700
-+++ trilinos-12.10.1-Source/packages/zoltan/src/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -678,5 +678,5 @@
- IMPORTEDLIBS ${IMPORTEDLIBS}
- )
-
--INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-+INSTALL(FILES ${MODULES} DESTINATION include)
-
-diff -Naur trilinos-12.10.1-Source.orig/packages/zoltan/src/fdriver/CMakeLists.txt trilinos-12.10.1-Source/packages/zoltan/src/fdriver/CMakeLists.txt
---- trilinos-12.10.1-Source.orig/packages/zoltan/src/fdriver/CMakeLists.txt 2016-12-05 13:46:37.231448208 -0700
-+++ trilinos-12.10.1-Source/packages/zoltan/src/fdriver/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700
-@@ -33,6 +33,6 @@
-
- # What is a good location for executables zdrive and zCPPdrive?
- # When should they be moved there? During install? Or build?
--#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-+#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION bin)
-
- ENDIF()
diff --git a/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild b/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild
deleted file mode 100644
index 0712f8623..000000000
--- a/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs multilib toolchain-funcs
-
-DESCRIPTION="Scientific library collection for large scale problems"
-HOMEPAGE="http://trilinos.sandia.gov/"
-SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-
-IUSE="
- adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre
- matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse
- superlu taucs tbb test threads tvmet yaml zlib
-"
-
-# TODO: fix export cmake function for tests
-RESTRICT="test"
-
-RDEPEND="
- sys-libs/binutils-libs
- virtual/blas
- virtual/lapack
- virtual/mpi
- adolc? ( sci-libs/adolc )
- arprec? ( sci-libs/arprec )
- boost? ( dev-libs/boost )
- clp? ( sci-libs/coinor-clp )
- cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
- eigen? ( dev-cpp/eigen:3 )
- gtest? ( dev-cpp/gtest )
- hdf5? ( sci-libs/hdf5[mpi] )
- hypre? ( sci-libs/hypre )
- hwloc? ( sys-apps/hwloc )
- matio? ( sci-libs/matio )
- mkl? ( sci-libs/mkl )
- metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
- mumps? ( sci-libs/mumps )
- netcdf? ( sci-libs/netcdf )
- petsc? ( sci-mathematics/petsc )
- qd? ( sci-libs/qd )
- qt4? ( dev-qt/qtgui:4 )
- scalapack? ( virtual/scalapack )
- scotch? ( sci-libs/scotch )
- sparse? ( sci-libs/cxsparse sci-libs/umfpack )
- superlu? ( sci-libs/superlu )
- taucs? ( sci-libs/taucs )
- tbb? ( dev-cpp/tbb )
- tvmet? ( dev-libs/tvmet )
- yaml? ( dev-cpp/yaml-cpp )
- zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${P}-Source"
-
-trilinos_conf() {
- local dirs libs d
- for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
- dirs="${dirs};${d:2}"
- done
- [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
- for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
- libs="${libs};${d:2}"
- done
- [[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
- dirs=""
- for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
- dirs="${dirs};${d:2}"
- done
- [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
-}
-
-trilinos_enable() {
- cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}}
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-fix-install-paths.patch
- epatch "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch
-}
-
-src_configure() {
-
- # temporarily disable SEACAS and pyTrilinos compilation
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"
- -DTrilinos_ENABLE_ALL_PACKAGES=ON
- -DTrilinos_ENABLE_SEACAS=OFF
- -DTrilinos_ENABLE_PyTrilinos=OFF
- -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
- -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
- -DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
- -DTPL_ENABLE_BinUtils=ON
- -DTPL_ENABLE_MPI=ON
- -DTPL_ENABLE_BLAS=ON
- -DTPL_ENABLE_LAPACK=ON
- $(cmake-utils_use test Trilinos_ENABLE_TESTS)
- $(trilinos_enable adolc)
- $(trilinos_enable arprec)
- $(trilinos_enable boost Boost)
- $(trilinos_enable boost BoostLib)
- $(trilinos_enable cppunit Cppunit)
- $(trilinos_enable clp Clp)
- $(trilinos_enable cuda)
- $(trilinos_enable cuda CUSPARSE)
- $(trilinos_enable cuda Thrust)
- $(trilinos_enable eigen Eigen)
- $(trilinos_enable gtest gtest)
- $(trilinos_enable glpk)
- $(trilinos_enable hdf5)
- $(trilinos_enable hwloc)
- $(trilinos_enable hypre)
- $(trilinos_enable matio)
- $(trilinos_enable metis)
- $(trilinos_enable mkl)
- $(trilinos_enable mkl PARDISO_MKL)
- $(trilinos_enable mumps)
- $(trilinos_enable netcdf Netcdf)
- $(trilinos_enable petsc)
- $(trilinos_enable qd)
- $(trilinos_enable qt4 QT)
- $(trilinos_enable scalapack)
- $(trilinos_enable scalapack BLACS)
- $(trilinos_enable scotch Scotch)
- $(trilinos_enable sparse AMD)
- $(trilinos_enable sparse CSparse)
- $(trilinos_enable sparse UMFPACK)
- $(trilinos_enable superlu SuperLU)
- $(trilinos_enable taucs)
- $(trilinos_enable tbb)
- $(trilinos_enable threads Pthread)
- $(trilinos_enable tvmet)
- $(trilinos_enable yaml yaml-cpp)
- $(trilinos_enable zlib Zlib)
- )
-
- use eigen && \
- mycmakeargs+=(
- -DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
- )
- use hypre && \
- mycmakeargs+=(
- -DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
- )
- use scotch && \
- mycmakeargs+=(
- -DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
- )
-
- # cxsparse is a rewrite of csparse + extras
- use sparse && \
- mycmakeargs+=(
- -DCSparse_LIBRARY_NAMES="cxsparse"
- )
-
- # mandatory blas and lapack
- trilinos_conf blas BLAS
- trilinos_conf lapack LAPACK
- use superlu && trilinos_conf superlu SuperLU
- use metis && trilinos_conf metis METIS
-
- # blacs library is included in scalapack these days
- if use scalapack; then
- trilinos_conf scalapack SCALAPACK
- mycmakeargs+=(
- -DBLACS_LIBRARY_NAMES="scalapack"
- -DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
- )
- fi
-
- # TODO: do we need that line?
- export CC=mpicc CXX=mpicxx && tc-export CC CXX
-
- # cmake-utils eclass patches the base directory CMakeLists.txt
- # which does not work for complex Trilinos CMake modules
- CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
-
- # TODO:
- # python bindings with python-r1
- # fix hypre bindings
- # fix hdf5
- # cuda/thrust is untested
- # do we always need mpi? and for all packages: blah[mpi] ?
- # install docs, examples
- # see what packages are related, do we need REQUIRED_USE
- # proper use flags description
- # add more use flags/packages ?
-}
-
-src_install() {
- cmake-utils_src_install
-
- # register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
- # has a chance to pick up the libraries...
- cat >> "${T}"/99trilinos <<- EOF
- LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
- EOF
- doenvd "${T}"/99trilinos
-}
diff --git a/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild b/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild
deleted file mode 100644
index b43aabad7..000000000
--- a/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils toolchain-funcs multilib toolchain-funcs
-
-DESCRIPTION="Scientific library collection for large scale problems"
-HOMEPAGE="http://trilinos.sandia.gov/"
-SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz"
-
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-LICENSE="BSD LGPL-2.1"
-SLOT="0"
-
-IUSE="
- adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre
- matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse
- superlu taucs tbb test threads tvmet yaml zlib 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 )
- qt4? ( dev-qt/qtgui:4 )
- scalapack? ( virtual/scalapack )
- scotch? ( sci-libs/scotch )
- sparse? ( sci-libs/cxsparse sci-libs/umfpack )
- superlu? ( sci-libs/superlu )
- taucs? ( sci-libs/taucs )
- tbb? ( dev-cpp/tbb )
- tvmet? ( dev-libs/tvmet )
- yaml? ( dev-cpp/yaml-cpp )
- zlib? ( sys-libs/zlib )
- X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}/${P}-Source"
-
-trilinos_conf() {
- local dirs libs d
- for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
- dirs="${dirs};${d:2}"
- done
- [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
- for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
- libs="${libs};${d:2}"
- done
- [[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
- dirs=""
- for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
- dirs="${dirs};${d:2}"
- done
- [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
-}
-
-trilinos_enable() {
- cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}}
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
- "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch \
- "${FILESDIR}"/${P}-fix_install_paths_for_destdir-2.patch \
- "${FILESDIR}"/${P}-fix_gcc_7.patch
-
- epatch_user
-}
-
-src_configure() {
-
- # temporarily disable pyTrilinos compilation
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"
- -DTrilinos_ENABLE_ALL_PACKAGES=ON
- -DZoltan2_ENABLE_Experimental=ON
- -DTrilinos_ENABLE_SEACASExodus=$(usex netcdf)
- -DTrilinos_ENABLE_SEACASExodiff=$(usex netcdf)
- -DTrilinos_ENABLE_PyTrilinos=OFF
- -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
- -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
- -DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
- -DTPL_ENABLE_BinUtils=ON
- -DTPL_ENABLE_MPI=ON
- -DTPL_ENABLE_BLAS=ON
- -DTPL_ENABLE_LAPACK=ON
- $(cmake-utils_use test Trilinos_ENABLE_TESTS)
- $(trilinos_enable adolc)
- $(trilinos_enable arprec)
- $(trilinos_enable boost Boost)
- $(trilinos_enable boost BoostLib)
- $(trilinos_enable cppunit Cppunit)
- $(trilinos_enable clp Clp)
- $(trilinos_enable cuda)
- $(trilinos_enable cuda CUSPARSE)
- $(trilinos_enable cuda Thrust)
- $(trilinos_enable eigen Eigen)
- $(trilinos_enable gtest gtest)
- $(trilinos_enable glpk)
- $(trilinos_enable hdf5)
- $(trilinos_enable hwloc)
- $(trilinos_enable hypre)
- $(trilinos_enable matio Matio)
- $(trilinos_enable metis)
- $(trilinos_enable mkl)
- $(trilinos_enable mkl PARDISO_MKL)
- $(trilinos_enable mumps)
- $(trilinos_enable netcdf Netcdf)
- $(trilinos_enable petsc)
- $(trilinos_enable qd)
- $(trilinos_enable qt4 QT)
- $(trilinos_enable scalapack)
- $(trilinos_enable scalapack BLACS)
- $(trilinos_enable scotch Scotch)
- $(trilinos_enable sparse AMD)
- $(trilinos_enable sparse CSparse)
- $(trilinos_enable sparse UMFPACK)
- $(trilinos_enable superlu SuperLU)
- $(trilinos_enable taucs)
- $(trilinos_enable tbb)
- $(trilinos_enable threads Pthread)
- $(trilinos_enable tvmet)
- $(trilinos_enable yaml yaml-cpp)
- $(trilinos_enable zlib Zlib)
- $(trilinos_enable X X11)
- )
-
- use eigen && \
- mycmakeargs+=(
- -DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
- )
- use hypre && \
- mycmakeargs+=(
- -DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
- )
- use scotch && \
- mycmakeargs+=(
- -DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
- )
-
- # cxsparse is a rewrite of csparse + extras
- use sparse && \
- mycmakeargs+=(
- -DCSparse_LIBRARY_NAMES="cxsparse"
- )
-
- # mandatory blas and lapack
- trilinos_conf blas BLAS
- trilinos_conf lapack LAPACK
- use superlu && trilinos_conf superlu SuperLU
- use metis && trilinos_conf metis METIS
-
- # blacs library is included in scalapack these days
- if use scalapack; then
- trilinos_conf scalapack SCALAPACK
- mycmakeargs+=(
- -DBLACS_LIBRARY_NAMES="scalapack"
- -DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
- )
- fi
-
- # TODO: do we need that line?
- export CC=mpicc CXX=mpicxx && tc-export CC CXX
-
- # cmake-utils eclass patches the base directory CMakeLists.txt
- # which does not work for complex Trilinos CMake modules
- CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
-
- # TODO:
- # python bindings with python-r1
- # fix hypre bindings
- # fix hdf5
- # cuda/thrust is untested
- # do we always need mpi? and for all packages: blah[mpi] ?
- # install docs, examples
- # see what packages are related, do we need REQUIRED_USE
- # proper use flags description
- # add more use flags/packages ?
-}
-
-src_install() {
- cmake-utils_src_install
-
- # 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
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/
@ 2018-08-31 15:39 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2018-08-31 15:39 UTC (permalink / raw
To: gentoo-commits
commit: 28d840bc2275b9d2614291ba41d6b1ff93e0ddfe
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 31 15:38:51 2018 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 15:38:51 2018 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=28d840bc
sci-libs/trilinos: fix compilation with superlu 5
Package-Manager: Portage-2.3.48, Repoman-2.3.10
.../files/trilinos-12.12.1-superlu-5.patch | 161 +++++++++++++++++++++
sci-libs/trilinos/trilinos-12.12.1-r1.ebuild | 1 +
2 files changed, 162 insertions(+)
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
new file mode 100644
index 000000000..24e8dbabd
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-12.12.1-superlu-5.patch
@@ -0,0 +1,161 @@
+From 83bec239ac6a63ed895a52567eab18925dd6a8cb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloemer@gmail.com>
+Date: Wed, 1 Jun 2016 19:38:01 +0200
+Subject: [PATCH] compatibility with SuperLU 5
+
+Thanks to Eric Bavier <bavier@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/trilinos-12.12.1-r1.ebuild b/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
index b74f3c8c6..432977e10 100644
--- a/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
@@ -64,6 +64,7 @@ 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() {
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/
@ 2019-08-05 6:52 Matthias Maier
0 siblings, 0 replies; 11+ messages in thread
From: Matthias Maier @ 2019-08-05 6:52 UTC (permalink / raw
To: gentoo-commits
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.schloemer@gmail.com>
-Date: Wed, 1 Jun 2016 19:38:01 +0200
-Subject: [PATCH] compatibility with SuperLU 5
-
-Thanks to Eric Bavier <bavier@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>tamiko@gentoo.org</email>
- <name>Matthias Maier</name>
- </maintainer>
- <maintainer type="person">
- <email>andyspiros@gmail.com</email>
- </maintainer>
- <maintainer type="project">
- <email>sci@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
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-08-05 6:52 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-14 18:20 [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/ Matthias Maier
-- strict thread matches above, loose matches on Subject: below --
2019-08-05 6:52 Matthias Maier
2018-08-31 15:39 Matthias Maier
2018-04-02 12:45 Justin Lecher
2015-08-28 11:14 Justin Lecher
2015-07-16 19:42 Jauhien Piatlicki
2015-03-14 8:21 Justin Lecher
2015-03-14 8:21 Justin Lecher
2015-03-14 8:21 Justin Lecher
2013-11-12 16:43 Nicolas Bock
2013-04-22 1:40 Christoph Junghans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox