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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
@ 2014-12-09 17:58 Christoph Junghans
  0 siblings, 0 replies; 9+ messages in thread
From: Christoph Junghans @ 2014-12-09 17:58 UTC (permalink / raw
  To: gentoo-commits

commit:     180dda21f7e970e576b6064ac387431056cea33e
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  6 21:52:06 2014 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Dec  6 21:52:06 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=180dda21

version bump

Package-Manager: portage-2.2.15

---
 sci-libs/trilinos/ChangeLog                        |   6 +
 .../files/trilinos-11.12.1-fix-install-paths.patch |  61 +++++++
 sci-libs/trilinos/trilinos-11.12.1.ebuild          | 202 +++++++++++++++++++++
 3 files changed, 269 insertions(+)

diff --git a/sci-libs/trilinos/ChangeLog b/sci-libs/trilinos/ChangeLog
index d6c571d..82242b8 100644
--- a/sci-libs/trilinos/ChangeLog
+++ b/sci-libs/trilinos/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*trilinos-11.12.1 (06 Dec 2014)
+
+  06 Dec 2014; Matthias Maier <tamiko@gentoo.org>
+  +files/trilinos-11.12.1-fix-install-paths.patch, +trilinos-11.12.1.ebuild:
+  version bump
+
 *trilinos-11.10.2 (21 Oct 2014)
 
   21 Oct 2014; Matthias Maier <tamiko@gentoo.org> +trilinos-11.10.2.ebuild,

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
new file mode 100644
index 0000000..130f3ce
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-11.12.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/package_arch/TribitsWriteClientExportFiles.cmake
++++ b/cmake/tribits/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/trilinos-11.12.1.ebuild b/sci-libs/trilinos/trilinos-11.12.1.ebuild
new file mode 100644
index 0000000..51734a4
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-11.12.1.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2014 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="${P}-Source.tar.bz2"
+
+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 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 fetch"
+
+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 )
+	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
+}
+
+src_configure() {
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
+		-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
+		-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 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] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
@ 2015-03-14  8:21 Justin Lecher
  0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-03-14  8:21 UTC (permalink / raw
  To: gentoo-commits

commit:     a4246b91d4554ae5a7fff431084d2fcce0851192
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: Sat Mar 14 08:21:00 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a4246b91

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] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
@ 2015-07-16 19:42 Jauhien Piatlicki
  0 siblings, 0 replies; 9+ messages in thread
From: Jauhien Piatlicki @ 2015-07-16 19:42 UTC (permalink / raw
  To: gentoo-commits

commit:     e7fd8c458e11b1763a661bcac3ba631ac8d3b230
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: Thu Jul 16 19:43:34 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=e7fd8c45

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] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
@ 2016-04-23 23:21 Christoph Junghans
  0 siblings, 0 replies; 9+ messages in thread
From: Christoph Junghans @ 2016-04-23 23:21 UTC (permalink / raw
  To: gentoo-commits

commit:     ca7ff0c633032cdb2d658335e748ede0a296b5d3
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 07:01:55 2016 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 07:01:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=ca7ff0c6

sci-libs/trilinos: Version bump to 12.6.2

Package-Manager: portage-2.2.26

 ...inos-12.6.2-fix_install_paths_for_destdir.patch | 652 +++++++++++++++++++++
 sci-libs/trilinos/trilinos-12.6.2.ebuild           | 207 +++++++
 2 files changed, 859 insertions(+)

diff --git a/sci-libs/trilinos/files/trilinos-12.6.2-fix_install_paths_for_destdir.patch b/sci-libs/trilinos/files/trilinos-12.6.2-fix_install_paths_for_destdir.patch
new file mode 100644
index 0000000..d3556c7
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-12.6.2-fix_install_paths_for_destdir.patch
@@ -0,0 +1,652 @@
+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 807a01e..7169c30 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/rol/adapters/belos/src/CMakeLists.txt b/packages/rol/adapters/belos/src/CMakeLists.txt
+index 05554af..fdc2681 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 016e5ed..c976498 100644
+--- a/packages/rol/adapters/epetra/src/CMakeLists.txt
++++ b/packages/rol/adapters/epetra/src/CMakeLists.txt
+@@ -43,4 +43,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/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 5a04b77..6a6872e 100644
+--- a/packages/stk/stk_io/stk_io/CMakeLists.txt
++++ b/packages/stk/stk_io/stk_io/CMakeLists.txt
+@@ -79,7 +79,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 1258631..f3afeb8 100644
+--- a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
++++ b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
+@@ -85,14 +85,13 @@ 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_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+index c025e1c..77937c4 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 647c895..cd55770 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 41d36f6..146099c 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 108c464..ef40627 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 29da134..e350a7d 100644
+--- a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
+@@ -94,4 +94,4 @@ FILE(GLOB SOURCES *.cpp)
+ #  )
+ 
+ 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 b616750..412dd0e 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 0629e38..493bd52 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 e3993d9..af1554f 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 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/sci-libs/trilinos/trilinos-12.6.2.ebuild b/sci-libs/trilinos/trilinos-12.6.2.ebuild
new file mode 100644
index 0000000..dca587c
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-12.6.2.ebuild
@@ -0,0 +1,207 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs multilib toolchain-funcs
+
+DESCRIPTION="Scientific library collection for large scale problems"
+HOMEPAGE="http://trilinos.sandia.gov/"
+SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+
+IUSE="
+	adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre
+	matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse
+	superlu taucs tbb test threads tvmet yaml zlib
+"
+
+# TODO: fix export cmake function for tests
+RESTRICT="test"
+
+RDEPEND="
+	virtual/blas
+	virtual/lapack
+	virtual/mpi
+	adolc? ( sci-libs/adolc )
+	arprec? ( sci-libs/arprec )
+	boost? ( dev-libs/boost )
+	clp? ( sci-libs/coinor-clp )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
+	eigen? ( dev-cpp/eigen:3 )
+	gtest? ( dev-cpp/gtest )
+	hdf5? ( sci-libs/hdf5[mpi] )
+	hypre? ( sci-libs/hypre )
+	hwloc? ( sys-apps/hwloc )
+	matio? ( sci-libs/matio )
+	mkl? ( sci-libs/mkl )
+	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
+	mumps? ( sci-libs/mumps )
+	netcdf? ( sci-libs/netcdf )
+	petsc? ( sci-mathematics/petsc )
+	qd? ( sci-libs/qd )
+	qt4? ( dev-qt/qtgui:4 )
+	scalapack? ( virtual/scalapack )
+	scotch? ( sci-libs/scotch )
+	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
+	superlu? ( sci-libs/superlu )
+	taucs? ( sci-libs/taucs )
+	tbb? ( dev-cpp/tbb )
+	tvmet? ( dev-libs/tvmet )
+	yaml? ( dev-cpp/yaml-cpp )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${P}-Source"
+
+trilinos_conf() {
+	local dirs libs d
+	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
+		dirs="${dirs};${d:2}"
+	done
+	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
+	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
+		libs="${libs};${d:2}"
+	done
+	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
+	dirs=""
+	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
+		dirs="${dirs};${d:2}"
+	done
+	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
+}
+
+trilinos_enable() {
+	cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
+		"${FILESDIR}"/${PN}-12.6.2-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] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
@ 2016-12-06 19:44 Christoph Junghans
  0 siblings, 0 replies; 9+ messages in thread
From: Christoph Junghans @ 2016-12-06 19:44 UTC (permalink / raw
  To: gentoo-commits

commit:     24b0bf330b0a38d5dbc96c0356ae93406d31f33b
Author:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  6 19:44:09 2016 +0000
Commit:     Christoph Junghans <junghans <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 19:44:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=24b0bf33

sci-libs/trilinos: version bump

Package-Manager: portage-2.3.0

 ...nos-12.10.1-fix_install_paths_for_destdir.patch | 603 +++++++++++++++++++++
 sci-libs/trilinos/trilinos-12.10.1.ebuild          | 210 +++++++
 2 files changed, 813 insertions(+)

diff --git a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch
new file mode 100644
index 0000000..2e8960e
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch
@@ -0,0 +1,603 @@
+diff -Naur trilinos-12.10.1-Source.orig/commonTools/gtest/CMakeLists.txt trilinos-12.10.1-Source/commonTools/gtest/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/commonTools/gtest/CMakeLists.txt	2016-12-05 13:46:36.981584433 -0700
++++ trilinos-12.10.1-Source/commonTools/gtest/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -31,7 +31,7 @@
+   )
+ 
+ #install gtest header into the correct subdir.
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
++INSTALL(FILES ${HEADERS} DESTINATION ${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
+ 
+ 
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/kokkos/containers/src/CMakeLists.txt trilinos-12.10.1-Source/packages/kokkos/containers/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/kokkos/containers/src/CMakeLists.txt	2016-12-05 13:46:37.071535392 -0700
++++ trilinos-12.10.1-Source/packages/kokkos/containers/src/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -15,7 +15,7 @@
+ FILE(GLOB HEADERS_IMPL impl/*.hpp)
+ FILE(GLOB SOURCES impl/*.cpp)
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ INSTALL(FILES ${HEADERS_IMPL} DESTINATION ${TRILINOS_INCDIR}/impl/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/kokkos/core/src/CMakeLists.txt trilinos-12.10.1-Source/packages/kokkos/core/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/kokkos/core/src/CMakeLists.txt	2016-12-05 13:46:37.061540841 -0700
++++ trilinos-12.10.1-Source/packages/kokkos/core/src/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -40,7 +40,7 @@
+ 
+ #-----------------------------------------------------------------------------
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/kokkos/core/src/impl/CMakeLists.txt trilinos-12.10.1-Source/packages/kokkos/core/src/impl/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/kokkos/core/src/impl/CMakeLists.txt	2016-12-05 13:46:37.061540841 -0700
++++ trilinos-12.10.1-Source/packages/kokkos/core/src/impl/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -12,7 +12,7 @@
+     DEPLIBS 
+     )
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/impl/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/belos/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/belos/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/rol/adapters/belos/src/CMakeLists.txt	2016-12-05 13:46:37.111513596 -0700
++++ trilinos-12.10.1-Source/packages/rol/adapters/belos/src/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -39,4 +39,4 @@
+   )
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/epetra/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/epetra/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/rol/adapters/epetra/src/CMakeLists.txt	2016-12-05 13:46:37.111513596 -0700
++++ trilinos-12.10.1-Source/packages/rol/adapters/epetra/src/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -42,4 +42,4 @@
+   )
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/sacado/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/sacado/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/rol/adapters/sacado/src/CMakeLists.txt	2016-12-05 13:46:37.101519046 -0700
++++ trilinos-12.10.1-Source/packages/rol/adapters/sacado/src/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -37,4 +37,4 @@
+   )
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/teuchos/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/teuchos/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/rol/adapters/teuchos/src/CMakeLists.txt	2016-12-05 13:46:37.101519046 -0700
++++ trilinos-12.10.1-Source/packages/rol/adapters/teuchos/src/CMakeLists.txt	2016-12-05 14:37:03.361602958 -0700
+@@ -35,4 +35,4 @@
+ )
+ 
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/thyra/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/thyra/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/rol/adapters/thyra/src/CMakeLists.txt	2016-12-05 13:46:37.111513596 -0700
++++ trilinos-12.10.1-Source/packages/rol/adapters/thyra/src/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -49,4 +49,4 @@
+   )
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/tpetra/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/tpetra/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/rol/adapters/tpetra/src/CMakeLists.txt	2016-12-05 13:46:37.111513596 -0700
++++ trilinos-12.10.1-Source/packages/rol/adapters/tpetra/src/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -46,4 +46,4 @@
+   )
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt	2016-12-05 13:46:37.401355574 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -46,7 +46,7 @@
+ )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/)
+ 
+ ADD_SUBDIRECTORY(main)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt	2016-12-05 13:46:37.401355574 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -34,5 +34,5 @@
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt	2016-12-05 13:46:37.391361023 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -21,5 +21,5 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt	2016-12-05 13:46:37.391361023 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -46,4 +46,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt	2016-12-05 13:46:37.381366472 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -49,7 +49,7 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
+ 
+ # AGS: I moved this to the bottom so that the link order was correct
+ # with  -lstk_io_uti before -lstk_io.  I think the DEPLIBS added in
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt	2016-12-05 13:46:37.381366472 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -45,4 +45,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt	2016-12-05 13:46:37.391361023 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -54,7 +54,7 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
+ 
+ INSTALL(FILES ${HEADERS_IMPL} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt	2016-12-05 13:46:37.391361023 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -48,5 +48,5 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt	2016-12-05 13:46:37.391361023 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -54,4 +54,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt	2016-12-05 13:46:37.381366472 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -68,5 +68,5 @@
+ )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt	2016-12-05 13:46:37.381366472 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -35,5 +35,5 @@
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt	2016-12-05 13:46:37.381366472 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -37,5 +37,5 @@
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt	2016-12-05 13:46:37.381366472 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -36,5 +36,5 @@
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt	2016-12-05 13:46:37.381366472 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -35,5 +35,5 @@
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt	2016-12-05 13:46:37.381366472 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt	2016-12-05 13:53:32.265171949 -0700
+@@ -35,5 +35,5 @@
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt	2016-12-05 13:46:37.381366472 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -35,5 +35,5 @@
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt	2016-12-05 13:46:37.381366472 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -35,5 +35,5 @@
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt	2016-12-05 13:46:37.401355574 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -46,4 +46,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt	2016-12-05 13:46:37.401355574 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -18,4 +18,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-  ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
++  ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt	2016-12-05 13:46:37.381366472 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -62,4 +62,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt	2016-12-05 13:46:37.381366472 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -34,5 +34,5 @@
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt	2016-12-05 13:46:37.401355574 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -54,4 +54,4 @@
+   )
+ 
+ #INSTALL(FILES ${HEADERS} DESTINATION
+-#    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
++#    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt	2016-12-05 13:46:37.391361023 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -16,6 +16,6 @@
+ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
+ 
+ INSTALL(FILES stk_config.h DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STKClassic_config.h DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt	2016-12-05 13:46:37.391361023 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -82,5 +82,5 @@
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt	2016-12-05 13:46:37.391361023 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -80,4 +80,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-        ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
++        ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt	2016-12-05 13:46:37.391361023 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -61,4 +61,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt	2016-12-05 13:46:37.391361023 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -50,4 +50,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt	2016-12-05 13:46:37.391361023 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -49,4 +49,4 @@
+   )
+ 
+ #INSTALL(FILES ${HEADERS} DESTINATION
+-#    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/)
++#    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt	2016-12-05 13:46:37.391361023 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -46,4 +46,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt	2016-12-05 13:46:37.411350125 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -77,4 +77,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/CMakeLists.txt	2016-12-05 13:46:37.401355574 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -78,7 +78,7 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
+ 
+ # AGS: I moved this to the bottom so that the link order was correct
+ # with  -lstk_io_uti before -lstk_io.  I think the DEPLIBS added in
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/util/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/util/CMakeLists.txt	2016-12-05 13:46:37.401355574 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/util/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -76,4 +76,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt	2016-12-05 13:46:37.421344676 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -84,14 +84,13 @@
+ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
+ 
+ INSTALL(FILES ${HEADERS_IMPL} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
+ 
+ INSTALL(FILES ${HEADERS_ELEMGRAPH} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph)
+ 
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h DESTINATION
+-        ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+-
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt	2016-12-05 13:46:37.421344676 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -71,4 +71,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_search/stk_search/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_search/stk_search/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_search/stk_search/CMakeLists.txt	2016-12-05 13:46:37.401355574 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_search/stk_search/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -69,4 +69,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt	2016-12-05 13:46:37.431339227 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -68,5 +68,5 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
+     
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_topology/stk_topology/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_topology/stk_topology/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_topology/stk_topology/CMakeLists.txt	2016-12-05 13:46:37.401355574 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_topology/stk_topology/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -71,7 +71,7 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/)
+ 
+ INSTALL(FILES ${DETAIL_HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt	2016-12-05 13:46:37.431339227 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -5,4 +5,4 @@
+ FILE(GLOB HEADERS *.hpp)
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/CMakeLists.txt	2016-12-05 13:46:37.411350125 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/CMakeLists.txt	2016-12-05 13:56:03.782564712 -0700
+@@ -18,6 +18,6 @@
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ 
+ INSTALL(FILES stk_config.h stk_kokkos_macros.h DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STK_Trilinos_config.h DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt	2016-12-05 13:46:37.411350125 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/diag/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -75,5 +75,5 @@
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt	2016-12-05 13:46:37.411350125 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/environment/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -73,4 +73,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-        ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
++        ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt	2016-12-05 13:46:37.411350125 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -92,4 +92,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/registry/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/registry/CMakeLists.txt	2016-12-05 13:46:37.411350125 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/registry/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -70,5 +70,5 @@
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt	2016-12-05 13:46:37.411350125 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -78,4 +78,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/util/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt	2016-12-05 13:46:37.411350125 -0700
++++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/util/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -75,4 +75,4 @@
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
+diff -Naur trilinos-12.10.1-Source.orig/packages/teuchos/kokkoscompat/src/CMakeLists.txt trilinos-12.10.1-Source/packages/teuchos/kokkoscompat/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/teuchos/kokkoscompat/src/CMakeLists.txt	2016-12-05 13:46:37.371371921 -0700
++++ trilinos-12.10.1-Source/packages/teuchos/kokkoscompat/src/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -27,7 +27,7 @@
+ # FIXME (mfh 19 Dec 2014) We should rely on TriBITS to handle
+ # installation.
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/trios/libraries/support/CMakeLists.txt trilinos-12.10.1-Source/packages/trios/libraries/support/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/trios/libraries/support/CMakeLists.txt	2016-12-05 13:46:37.531284737 -0700
++++ trilinos-12.10.1-Source/packages/trios/libraries/support/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -168,6 +168,6 @@
+ 
+ ########### install targets ###############
+ 
+-# INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
++# INSTALL(FILES ${MODULES} DESTINATION include)
+ 
+ TRIBITS_SUBPACKAGE_POSTPROCESS()
+diff -Naur trilinos-12.10.1-Source.orig/packages/zoltan/src/CMakeLists.txt trilinos-12.10.1-Source/packages/zoltan/src/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/zoltan/src/CMakeLists.txt	2016-12-05 13:46:37.231448208 -0700
++++ trilinos-12.10.1-Source/packages/zoltan/src/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -678,5 +678,5 @@
+   IMPORTEDLIBS ${IMPORTEDLIBS}
+   )
+ 
+-INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
++INSTALL(FILES ${MODULES} DESTINATION include)
+ 
+diff -Naur trilinos-12.10.1-Source.orig/packages/zoltan/src/fdriver/CMakeLists.txt trilinos-12.10.1-Source/packages/zoltan/src/fdriver/CMakeLists.txt
+--- trilinos-12.10.1-Source.orig/packages/zoltan/src/fdriver/CMakeLists.txt	2016-12-05 13:46:37.231448208 -0700
++++ trilinos-12.10.1-Source/packages/zoltan/src/fdriver/CMakeLists.txt	2016-12-05 13:53:32.275166500 -0700
+@@ -33,6 +33,6 @@
+ 
+ #  What is a good location for executables zdrive and zCPPdrive?
+ #  When should they be moved there?  During install?  Or build?
+-#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
++#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION bin)
+ 
+ ENDIF()

diff --git a/sci-libs/trilinos/trilinos-12.10.1.ebuild b/sci-libs/trilinos/trilinos-12.10.1.ebuild
new file mode 100644
index 0000000..878ea8f
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-12.10.1.ebuild
@@ -0,0 +1,210 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils toolchain-funcs multilib toolchain-funcs
+
+DESCRIPTION="Scientific library collection for large scale problems"
+HOMEPAGE="http://trilinos.sandia.gov/"
+SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz"
+
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+LICENSE="BSD LGPL-2.1"
+SLOT="0"
+
+IUSE="
+	adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre
+	matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse
+	superlu taucs tbb test threads tvmet yaml zlib
+"
+
+# TODO: fix export cmake function for tests
+RESTRICT="test"
+
+RDEPEND="
+	sys-libs/binutils-libs
+	virtual/blas
+	virtual/lapack
+	virtual/mpi
+	adolc? ( sci-libs/adolc )
+	arprec? ( sci-libs/arprec )
+	boost? ( dev-libs/boost )
+	clp? ( sci-libs/coinor-clp )
+	cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 )
+	eigen? ( dev-cpp/eigen:3 )
+	gtest? ( dev-cpp/gtest )
+	hdf5? ( sci-libs/hdf5[mpi] )
+	hypre? ( sci-libs/hypre )
+	hwloc? ( sys-apps/hwloc )
+	matio? ( sci-libs/matio )
+	mkl? ( sci-libs/mkl )
+	metis? ( || ( sci-libs/parmetis sci-libs/metis ) )
+	mumps? ( sci-libs/mumps )
+	netcdf? ( sci-libs/netcdf )
+	petsc? ( sci-mathematics/petsc )
+	qd? ( sci-libs/qd )
+	qt4? ( dev-qt/qtgui:4 )
+	scalapack? ( virtual/scalapack )
+	scotch? ( sci-libs/scotch )
+	sparse? ( sci-libs/cxsparse sci-libs/umfpack )
+	superlu? ( sci-libs/superlu )
+	taucs? ( sci-libs/taucs )
+	tbb? ( dev-cpp/tbb )
+	tvmet? ( dev-libs/tvmet )
+	yaml? ( dev-cpp/yaml-cpp )
+	zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${P}-Source"
+
+trilinos_conf() {
+	local dirs libs d
+	for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do
+		dirs="${dirs};${d:2}"
+	done
+	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" )
+	for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do
+		libs="${libs};${d:2}"
+	done
+	[[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" )
+	dirs=""
+	for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do
+		dirs="${dirs};${d:2}"
+	done
+	[[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" )
+}
+
+trilinos_enable() {
+	cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
+		"${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch
+}
+
+src_configure() {
+
+	# temporarily disable pyTrilinos compilation
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=ON
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"
+		-DTrilinos_ENABLE_ALL_PACKAGES=ON
+		-DZoltan2_ENABLE_Experimental=ON
+		-DTrilinos_ENABLE_SEACASExodus=$(usex netcdf)
+	    -DTrilinos_ENABLE_SEACASExodiff=$(usex netcdf)
+		-DTrilinos_ENABLE_PyTrilinos=OFF
+		-DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos"
+		-DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos"
+		-DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake"
+		-DTPL_ENABLE_BinUtils=ON
+		-DTPL_ENABLE_MPI=ON
+		-DTPL_ENABLE_BLAS=ON
+		-DTPL_ENABLE_LAPACK=ON
+		$(cmake-utils_use test Trilinos_ENABLE_TESTS)
+		$(trilinos_enable adolc)
+		$(trilinos_enable arprec)
+		$(trilinos_enable boost Boost)
+		$(trilinos_enable boost BoostLib)
+		$(trilinos_enable cppunit Cppunit)
+		$(trilinos_enable clp Clp)
+		$(trilinos_enable cuda)
+		$(trilinos_enable cuda CUSPARSE)
+		$(trilinos_enable cuda Thrust)
+		$(trilinos_enable eigen Eigen)
+		$(trilinos_enable gtest gtest)
+		$(trilinos_enable glpk)
+		$(trilinos_enable hdf5)
+		$(trilinos_enable hwloc)
+		$(trilinos_enable hypre)
+		$(trilinos_enable matio Matio)
+		$(trilinos_enable metis)
+		$(trilinos_enable mkl)
+		$(trilinos_enable mkl PARDISO_MKL)
+		$(trilinos_enable mumps)
+		$(trilinos_enable netcdf Netcdf)
+		$(trilinos_enable petsc)
+		$(trilinos_enable qd)
+		$(trilinos_enable qt4 QT)
+		$(trilinos_enable scalapack)
+		$(trilinos_enable scalapack BLACS)
+		$(trilinos_enable scotch Scotch)
+		$(trilinos_enable sparse AMD)
+		$(trilinos_enable sparse CSparse)
+		$(trilinos_enable sparse UMFPACK)
+		$(trilinos_enable superlu SuperLU)
+		$(trilinos_enable taucs)
+		$(trilinos_enable tbb)
+		$(trilinos_enable threads Pthread)
+		$(trilinos_enable tvmet)
+		$(trilinos_enable yaml yaml-cpp)
+		$(trilinos_enable zlib Zlib)
+	)
+
+	use eigen && \
+		mycmakeargs+=(
+		-DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3"
+	)
+	use hypre && \
+		mycmakeargs+=(
+		-DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre"
+	)
+	use scotch && \
+		mycmakeargs+=(
+		-DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch"
+	)
+
+	# cxsparse is a rewrite of csparse + extras
+	use sparse && \
+		mycmakeargs+=(
+		-DCSparse_LIBRARY_NAMES="cxsparse"
+	)
+
+	# mandatory blas and lapack
+	trilinos_conf blas BLAS
+	trilinos_conf lapack LAPACK
+	use superlu && trilinos_conf superlu SuperLU
+	use metis && trilinos_conf metis METIS
+
+	# blacs library is included in scalapack these days
+	if use scalapack; then
+		trilinos_conf scalapack SCALAPACK
+		mycmakeargs+=(
+			-DBLACS_LIBRARY_NAMES="scalapack"
+			-DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs"
+		)
+	fi
+
+	# TODO: do we need that line?
+	export CC=mpicc CXX=mpicxx && tc-export CC CXX
+
+	# cmake-utils eclass patches the base directory CMakeLists.txt
+	# which does not work for complex Trilinos CMake modules
+	CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure
+
+	# TODO:
+	# python bindings with python-r1
+	# fix hypre bindings
+	# fix hdf5
+	# cuda/thrust is untested
+	# do we always need mpi? and for all packages: blah[mpi] ?
+	# install docs, examples
+	# see what packages are related, do we need REQUIRED_USE
+	# proper use flags description
+	# add more use flags/packages ?
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# register $(get_libdir)/trilinos in LDPATH so that the dynamic linker
+	# has a chance to pick up the libraries...
+	cat >> "${T}"/99trilinos <<- EOF
+	LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos"
+	EOF
+	doenvd "${T}"/99trilinos
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
@ 2017-01-14 15:01 Justin Lecher
  0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2017-01-14 15:01 UTC (permalink / raw
  To: gentoo-commits

commit:     9aa67941bf580f2ea9d2e733d82c941d1847b9d0
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 14:57:28 2017 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jan 14 14:57:28 2017 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=9aa67941

sci-libs/trilinos: fix installation

Package-Manager: Portage-2.3.0, Repoman-2.3.1

 .../trilinos-12.10.1-fix_install_paths_for_destdir-2.patch     | 10 ++++++++++
 sci-libs/trilinos/trilinos-12.10.1.ebuild                      |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

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
new file mode 100644
index 0000000..52ddc76
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch
@@ -0,0 +1,10 @@
+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/trilinos-12.10.1.ebuild b/sci-libs/trilinos/trilinos-12.10.1.ebuild
index 878ea8f..c00a3ef 100644
--- a/sci-libs/trilinos/trilinos-12.10.1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -84,7 +84,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.patch \
+		"${FILESDIR}"/${P}-fix_install_paths_for_destdir-2.patch
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
@ 2018-03-01 20:18 Matthias Maier
  0 siblings, 0 replies; 9+ messages in thread
From: Matthias Maier @ 2018-03-01 20:18 UTC (permalink / raw
  To: gentoo-commits

commit:     38595d3ace6adaa1b66b6641598eb4dfcd9ae94b
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 17:29:10 2018 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Mar  1 20:18:27 2018 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=38595d3a

sci-libs/trilinos: drop old versions

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../files/trilinos-11.12.1-fix-install-paths.patch |  61 --
 .../files/trilinos-11.4.2-fix-install-paths.patch  |  60 --
 ...inos-12.0.1-fix_install_paths_for_destdir.patch | 654 ---------------------
 .../files/trilinos-12.2.1-compilation_fixes.patch  |  43 --
 ...inos-12.6.2-fix_install_paths_for_destdir.patch | 652 --------------------
 sci-libs/trilinos/trilinos-12.0.1.ebuild           | 207 -------
 sci-libs/trilinos/trilinos-12.2.1.ebuild           | 208 -------
 sci-libs/trilinos/trilinos-12.6.3.ebuild           | 207 -------
 sci-libs/trilinos/trilinos-12.6.4.ebuild           | 207 -------
 9 files changed, 2299 deletions(-)

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
deleted file mode 100644
index 9a0229239..000000000
--- a/sci-libs/trilinos/files/trilinos-11.12.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/package_arch/TribitsWriteClientExportFiles.cmake
-+++ b/cmake/tribits/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-11.4.2-fix-install-paths.patch b/sci-libs/trilinos/files/trilinos-11.4.2-fix-install-paths.patch
deleted file mode 100644
index a9c222e0e..000000000
--- a/sci-libs/trilinos/files/trilinos-11.4.2-fix-install-paths.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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/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
deleted file mode 100644
index cb08d26e9..000000000
--- a/sci-libs/trilinos/files/trilinos-12.0.1-fix_install_paths_for_destdir.patch
+++ /dev/null
@@ -1,654 +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/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/files/trilinos-12.2.1-compilation_fixes.patch b/sci-libs/trilinos/files/trilinos-12.2.1-compilation_fixes.patch
deleted file mode 100644
index a77a8dccf..000000000
--- a/sci-libs/trilinos/files/trilinos-12.2.1-compilation_fixes.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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/files/trilinos-12.6.2-fix_install_paths_for_destdir.patch b/sci-libs/trilinos/files/trilinos-12.6.2-fix_install_paths_for_destdir.patch
deleted file mode 100644
index d3556c7cb..000000000
--- a/sci-libs/trilinos/files/trilinos-12.6.2-fix_install_paths_for_destdir.patch
+++ /dev/null
@@ -1,652 +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/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 807a01e..7169c30 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/rol/adapters/belos/src/CMakeLists.txt b/packages/rol/adapters/belos/src/CMakeLists.txt
-index 05554af..fdc2681 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 016e5ed..c976498 100644
---- a/packages/rol/adapters/epetra/src/CMakeLists.txt
-+++ b/packages/rol/adapters/epetra/src/CMakeLists.txt
-@@ -43,4 +43,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/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 5a04b77..6a6872e 100644
---- a/packages/stk/stk_io/stk_io/CMakeLists.txt
-+++ b/packages/stk/stk_io/stk_io/CMakeLists.txt
-@@ -79,7 +79,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 1258631..f3afeb8 100644
---- a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
-+++ b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
-@@ -85,14 +85,13 @@ 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_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
-index c025e1c..77937c4 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 647c895..cd55770 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 41d36f6..146099c 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 108c464..ef40627 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 29da134..e350a7d 100644
---- a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
-+++ b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
-@@ -94,4 +94,4 @@ FILE(GLOB SOURCES *.cpp)
- #  )
- 
- 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 b616750..412dd0e 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 0629e38..493bd52 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 e3993d9..af1554f 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 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/sci-libs/trilinos/trilinos-12.0.1.ebuild b/sci-libs/trilinos/trilinos-12.0.1.ebuild
deleted file mode 100644
index d216f5411..000000000
--- a/sci-libs/trilinos/trilinos-12.0.1.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}"/${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"
-		-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.2.1.ebuild b/sci-libs/trilinos/trilinos-12.2.1.ebuild
deleted file mode 100644
index f1870a99e..000000000
--- a/sci-libs/trilinos/trilinos-12.2.1.ebuild
+++ /dev/null
@@ -1,208 +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}"/${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() {
-
-	# 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.6.3.ebuild b/sci-libs/trilinos/trilinos-12.6.3.ebuild
deleted file mode 100644
index 3beafc449..000000000
--- a/sci-libs/trilinos/trilinos-12.6.3.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}"/${PN}-11.14.1-fix-install-paths.patch \
-		"${FILESDIR}"/${PN}-12.6.2-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.6.4.ebuild b/sci-libs/trilinos/trilinos-12.6.4.ebuild
deleted file mode 100644
index 3beafc449..000000000
--- a/sci-libs/trilinos/trilinos-12.6.4.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}"/${PN}-11.14.1-fix-install-paths.patch \
-		"${FILESDIR}"/${PN}-12.6.2-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] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
@ 2018-03-01 20:18 Matthias Maier
  0 siblings, 0 replies; 9+ messages in thread
From: Matthias Maier @ 2018-03-01 20:18 UTC (permalink / raw
  To: gentoo-commits

commit:     71b61b6baebd6d93da9ed756a136a325828ecce8
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 17:26:41 2018 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Mar  1 20:18:14 2018 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=71b61b6b

sci-libs/trilinos: version bump to 12.12.1

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 ...nos-12.12.1-fix_install_paths_for_destdir.patch | 1069 ++++++++++++++++++++
 ...trilinos-12.12.1-fix_sundance_compilation.patch |   33 +
 sci-libs/trilinos/trilinos-12.12.1.ebuild          |  207 ++++
 3 files changed, 1309 insertions(+)

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
new file mode 100644
index 000000000..d4e04a438
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-12.12.1-fix_install_paths_for_destdir.patch
@@ -0,0 +1,1069 @@
+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
new file mode 100644
index 000000000..377485bfe
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-12.12.1-fix_sundance_compilation.patch
@@ -0,0 +1,33 @@
+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/trilinos-12.12.1.ebuild b/sci-libs/trilinos/trilinos-12.12.1.ebuild
new file mode 100644
index 000000000..2e8589530
--- /dev/null
+++ b/sci-libs/trilinos/trilinos-12.12.1.ebuild
@@ -0,0 +1,207 @@
+# 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 qt 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 )
+	qt? ( dev-qt/qtgui )
+	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
+)
+
+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_QT="$(usex qt)"
+		-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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/
@ 2019-04-04  4:00 Matthias Maier
  0 siblings, 0 replies; 9+ messages in thread
From: Matthias Maier @ 2019-04-04  4:00 UTC (permalink / raw
  To: gentoo-commits

commit:     d7367338b1cf7b5d6a8a5344755564145875d195
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  2 14:24:38 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 03:57:51 2019 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=d7367338

sci-libs/trilinos: version bump to 12.14.1

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 ...nos-12.14.1-fix_install_paths_for_destdir.patch | 973 +++++++++++++++++++++
 sci-libs/trilinos/trilinos-12.12.1-r1.ebuild       |   2 +-
 ...s-12.12.1-r1.ebuild => trilinos-12.14.1.ebuild} |  14 +-
 3 files changed, 981 insertions(+), 8 deletions(-)

diff --git a/sci-libs/trilinos/files/trilinos-12.14.1-fix_install_paths_for_destdir.patch b/sci-libs/trilinos/files/trilinos-12.14.1-fix_install_paths_for_destdir.patch
new file mode 100644
index 000000000..c59d278ca
--- /dev/null
+++ b/sci-libs/trilinos/files/trilinos-12.14.1-fix_install_paths_for_destdir.patch
@@ -0,0 +1,973 @@
+diff --git a/cmake/tribits/examples/tpls/SimpleTpl/CMakeLists.txt b/cmake/tribits/examples/tpls/SimpleTpl/CMakeLists.txt
+index e95f4289..e1244b48 100644
+--- a/cmake/tribits/examples/tpls/SimpleTpl/CMakeLists.txt
++++ b/cmake/tribits/examples/tpls/SimpleTpl/CMakeLists.txt
+@@ -4,12 +4,12 @@ ADD_LIBRARY(simpletpl SimpleTpl.hpp SimpleTpl.cpp)
+ 
+ INSTALL(
+   TARGETS simpletpl
+-  RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
+-  LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
+-  ARCHIVE DESTINATION "${CMAKE_INSTALL_PREFIX}/lib"
++  RUNTIME DESTINATION "lib"
++  LIBRARY DESTINATION "lib"
++  ARCHIVE DESTINATION "lib"
+   )
+ 
+ INSTALL(
+   FILES SimpleTpl.hpp
+-  DESTINATION "${CMAKE_INSTALL_PREFIX}/include"
++  DESTINATION "include"
+   )
+diff --git a/commonTools/gtest/CMakeLists.txt b/commonTools/gtest/CMakeLists.txt
+index 35075d69..563955e8 100644
+--- a/commonTools/gtest/CMakeLists.txt
++++ b/commonTools/gtest/CMakeLists.txt
+@@ -34,7 +34,7 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ #install gtest header into the correct subdir.
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
++INSTALL(FILES ${HEADERS} DESTINATION ${Trilinos_INSTALL_INCLUDE_DIR}/gtest/)
+ 
+ #
+ # D) Do standard postprocessing
+diff --git a/packages/intrepid2/src/CMakeLists.txt b/packages/intrepid2/src/CMakeLists.txt
+index c01d0081..65830941 100644
+--- a/packages/intrepid2/src/CMakeLists.txt
++++ b/packages/intrepid2/src/CMakeLists.txt
+@@ -4,7 +4,7 @@
+ 
+ TRIBITS_CONFIGURE_FILE(Intrepid2_config.h)
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ #
+ # B) Define the header and source files (and directories)
+diff --git a/packages/kokkos-kernels/src/CMakeLists.txt b/packages/kokkos-kernels/src/CMakeLists.txt
+index da6afef5..06375151 100644
+--- a/packages/kokkos-kernels/src/CMakeLists.txt
++++ b/packages/kokkos-kernels/src/CMakeLists.txt
+@@ -4,7 +4,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+diff --git a/packages/kokkos/containers/src/CMakeLists.txt b/packages/kokkos/containers/src/CMakeLists.txt
+index e68fcad5..289d23bf 100644
+--- a/packages/kokkos/containers/src/CMakeLists.txt
++++ b/packages/kokkos/containers/src/CMakeLists.txt
+@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ if(KOKKOS_LEGACY_TRIBITS)
+ 
+diff --git a/packages/kokkos/core/src/CMakeLists.txt b/packages/kokkos/core/src/CMakeLists.txt
+index eb026167..2722d810 100644
+--- a/packages/kokkos/core/src/CMakeLists.txt
++++ b/packages/kokkos/core/src/CMakeLists.txt
+@@ -5,7 +5,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+diff --git a/packages/kokkos/core/src/impl/CMakeLists.txt b/packages/kokkos/core/src/impl/CMakeLists.txt
+index c543194d..1021f421 100644
+--- a/packages/kokkos/core/src/impl/CMakeLists.txt
++++ b/packages/kokkos/core/src/impl/CMakeLists.txt
+@@ -12,7 +12,7 @@ TRIBITS_ADD_LIBRARY(
+     DEPLIBS 
+     )
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/impl/)
+ 
+diff --git a/packages/rol/adapters/arrayfire/src/CMakeLists.txt b/packages/rol/adapters/arrayfire/src/CMakeLists.txt
+index 76e71e3e..f8815986 100644
+--- a/packages/rol/adapters/arrayfire/src/CMakeLists.txt
++++ b/packages/rol/adapters/arrayfire/src/CMakeLists.txt
+@@ -35,4 +35,4 @@ IF (ROL_ENABLE_ArrayFireCPU)
+   APPEND_GLOB(HEADERS ${DIR}/*.hpp)
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/belos/src/CMakeLists.txt b/packages/rol/adapters/belos/src/CMakeLists.txt
+index 198ee38d..878d1b82 100644
+--- a/packages/rol/adapters/belos/src/CMakeLists.txt
++++ b/packages/rol/adapters/belos/src/CMakeLists.txt
+@@ -43,4 +43,4 @@ IF (ROL_ENABLE_Belos)
+ 
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/eigen/src/CMakeLists.txt b/packages/rol/adapters/eigen/src/CMakeLists.txt
+index 54a00e2b..fe46e5bb 100644
+--- a/packages/rol/adapters/eigen/src/CMakeLists.txt
++++ b/packages/rol/adapters/eigen/src/CMakeLists.txt
+@@ -38,4 +38,4 @@ IF (ROL_ENABLE_Eigen)
+ 
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/epetra/src/CMakeLists.txt b/packages/rol/adapters/epetra/src/CMakeLists.txt
+index 99fb601d..11b20e44 100644
+--- a/packages/rol/adapters/epetra/src/CMakeLists.txt
++++ b/packages/rol/adapters/epetra/src/CMakeLists.txt
+@@ -41,4 +41,4 @@ IF (ROL_ENABLE_Epetra)
+ 
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/minitensor/src/CMakeLists.txt b/packages/rol/adapters/minitensor/src/CMakeLists.txt
+index b365e620..e4f4b971 100644
+--- a/packages/rol/adapters/minitensor/src/CMakeLists.txt
++++ b/packages/rol/adapters/minitensor/src/CMakeLists.txt
+@@ -76,4 +76,4 @@ IF (ROL_ENABLE_Boost AND ROL_ENABLE_MiniTensor)
+ 
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/mpi/src/CMakeLists.txt b/packages/rol/adapters/mpi/src/CMakeLists.txt
+index e979c298..5354b856 100644
+--- a/packages/rol/adapters/mpi/src/CMakeLists.txt
++++ b/packages/rol/adapters/mpi/src/CMakeLists.txt
+@@ -42,4 +42,4 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/function)
+ 
+ 
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/pebbl/src/CMakeLists.txt b/packages/rol/adapters/pebbl/src/CMakeLists.txt
+index 3a5b9d9b..286192ce 100644
+--- a/packages/rol/adapters/pebbl/src/CMakeLists.txt
++++ b/packages/rol/adapters/pebbl/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ IF (ROL_ENABLE_pebbl)
+   )
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/sacado/src/CMakeLists.txt b/packages/rol/adapters/sacado/src/CMakeLists.txt
+index 569e9cc9..a7a9ac90 100644
+--- a/packages/rol/adapters/sacado/src/CMakeLists.txt
++++ b/packages/rol/adapters/sacado/src/CMakeLists.txt
+@@ -37,4 +37,4 @@ IF (ROL_ENABLE_Sacado)
+ 
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/teuchos/src/CMakeLists.txt b/packages/rol/adapters/teuchos/src/CMakeLists.txt
+index f1b4114f..b16e8c8d 100644
+--- a/packages/rol/adapters/teuchos/src/CMakeLists.txt
++++ b/packages/rol/adapters/teuchos/src/CMakeLists.txt
+@@ -49,4 +49,4 @@ IF (ROL_ENABLE_Teuchos)
+ ENDIF()
+ 
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/thyra/src/CMakeLists.txt b/packages/rol/adapters/thyra/src/CMakeLists.txt
+index b10d3814..ed56b725 100644
+--- a/packages/rol/adapters/thyra/src/CMakeLists.txt
++++ b/packages/rol/adapters/thyra/src/CMakeLists.txt
+@@ -42,4 +42,4 @@ IF (ROL_ENABLE_Thyra)
+ 
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/tpetra/src/CMakeLists.txt b/packages/rol/adapters/tpetra/src/CMakeLists.txt
+index f3bf831d..5d8c7fa6 100644
+--- a/packages/rol/adapters/tpetra/src/CMakeLists.txt
++++ b/packages/rol/adapters/tpetra/src/CMakeLists.txt
+@@ -51,4 +51,4 @@ IF (ROL_ENABLE_Tpetra)
+ 
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/rol/adapters/trikota/src/CMakeLists.txt b/packages/rol/adapters/trikota/src/CMakeLists.txt
+index f55d957b..31cd3b71 100644
+--- a/packages/rol/adapters/trikota/src/CMakeLists.txt
++++ b/packages/rol/adapters/trikota/src/CMakeLists.txt
+@@ -50,4 +50,4 @@ IF (ROL_ENABLE_TriKota)
+ #  )
+ ENDIF()
+ 
+-INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/seacas/applications/explore/CMakeLists.txt b/packages/seacas/applications/explore/CMakeLists.txt
+index b4ca4306..a43fd11c 100644
+--- a/packages/seacas/applications/explore/CMakeLists.txt
++++ b/packages/seacas/applications/explore/CMakeLists.txt
+@@ -23,7 +23,7 @@ TRIBITS_ADD_EXECUTABLE(
+   )
+ 
+ if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj")
+-InstallSymLink(explore ${CMAKE_INSTALL_PREFIX}/bin/grope)
++InstallSymLink(explore bin/grope)
+ endif()
+ 
+ install_executable(explore)
+diff --git a/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt b/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt
+index d967154d..987e2071 100644
+--- a/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt
++++ b/packages/seacas/libraries/exoIIv2for32/CMakeLists.txt
+@@ -25,7 +25,7 @@ if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj")
+       ${CMAKE_CURRENT_SOURCE_DIR}/src/exo_jack_32.c
+     )
+     set_target_properties(exoIIv2for32_static PROPERTIES OUTPUT_NAME exoIIv2for32)
+-    INSTALL(TARGETS exoIIv2for32_static DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL(TARGETS exoIIv2for32_static DESTINATION lib)
+   endif()
+ endif()
+ 
+diff --git a/packages/seacas/libraries/exodus/CMakeLists.txt b/packages/seacas/libraries/exodus/CMakeLists.txt
+index ee13b3a8..03d20fa5 100644
+--- a/packages/seacas/libraries/exodus/CMakeLists.txt
++++ b/packages/seacas/libraries/exodus/CMakeLists.txt
+@@ -47,12 +47,12 @@ if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj")
+               ${SOURCES} ${DEP_SOURCES}
+       )
+       set_target_properties(exodus_static PROPERTIES OUTPUT_NAME exodus)
+-      INSTALL(TARGETS exodus_static DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
++      INSTALL(TARGETS exodus_static DESTINATION lib)
+    endif(BUILD_SHARED_LIBS)
+ 
+    # For backwards compatibility, the C exodus library was called libexoIIv2c.a
+    # Create a symbolic link from libexodus.a to libexoIIv2c.a -- do only for static lib
+-   InstallSymLink(libexodus.a ${CMAKE_INSTALL_PREFIX}/lib/libexoIIv2c.a)
++   InstallSymLink(libexodus.a lib/libexoIIv2c.a)
+ 
+    # add a target to generate API documentation with Doxygen
+    if(SEACASProj_ENABLE_DOXYGEN)
+diff --git a/packages/seacas/libraries/exodus_for/CMakeLists.txt b/packages/seacas/libraries/exodus_for/CMakeLists.txt
+index a1a57385..78d9dea0 100644
+--- a/packages/seacas/libraries/exodus_for/CMakeLists.txt
++++ b/packages/seacas/libraries/exodus_for/CMakeLists.txt
+@@ -29,12 +29,12 @@ if (${CMAKE_PROJECT_NAME} STREQUAL "SEACASProj")
+       ${SOURCES}
+     )
+     set_target_properties(exodus_for_static PROPERTIES OUTPUT_NAME exodus_for)
+-    INSTALL(TARGETS exodus_for_static DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
++    INSTALL(TARGETS exodus_for_static DESTINATION lib)
+   endif()
+ 
+   # For backwards compatibility, the Fortran exodus library was called libexoIIv2for.a
+   # Create a symbolic link from libexodus_for.a to libexoIIv2for.a -- do only for static lib
+-  InstallSymLink(libexodus_for.a ${CMAKE_INSTALL_PREFIX}/lib/libexoIIv2for.a)
++  InstallSymLink(libexodus_for.a lib/libexoIIv2for.a)
+ endif()
+ 
+ TRIBITS_ADD_TEST_DIRECTORIES(test)
+diff --git a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/CMakeLists.txt b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/CMakeLists.txt
+index f4704d35..20920be8 100644
+--- a/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/CMakeLists.txt
++++ b/packages/seacas/libraries/ioss/src/visualization/ParaViewCatalystIossAdapter/CMakeLists.txt
+@@ -23,11 +23,11 @@ endif()
+ 
+ SET(CMAKE_SKIP_BUILD_RPATH FALSE)
+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib" ${PARAVIEW_PYTHON_LIBRARY_RPATH_DIRECTORY})
++SET(CMAKE_INSTALL_RPATH "lib" ${PARAVIEW_PYTHON_LIBRARY_RPATH_DIRECTORY})
+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
++LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "lib" isSystemDir)
+ IF("${isSystemDir}" STREQUAL "-1")
+-   SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
++   SET(CMAKE_INSTALL_RPATH "lib")
+ ENDIF("${isSystemDir}" STREQUAL "-1")
+ 
+ include_directories("include")
+diff --git a/packages/shylu/shylu_dd/bddc/src/CMakeLists.txt b/packages/shylu/shylu_dd/bddc/src/CMakeLists.txt
+index 23d9916e..a02af7cf 100644
+--- a/packages/shylu/shylu_dd/bddc/src/CMakeLists.txt
++++ b/packages/shylu/shylu_dd/bddc/src/CMakeLists.txt
+@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+diff --git a/packages/shylu/shylu_node/basker/src/CMakeLists.txt b/packages/shylu/shylu_node/basker/src/CMakeLists.txt
+index 1f3f6b28..a189f785 100644
+--- a/packages/shylu/shylu_node/basker/src/CMakeLists.txt
++++ b/packages/shylu/shylu_node/basker/src/CMakeLists.txt
+@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+diff --git a/packages/shylu/shylu_node/fastilu/src/CMakeLists.txt b/packages/shylu/shylu_node/fastilu/src/CMakeLists.txt
+index b6bd0e74..d959a9f0 100644
+--- a/packages/shylu/shylu_node/fastilu/src/CMakeLists.txt
++++ b/packages/shylu/shylu_node/fastilu/src/CMakeLists.txt
+@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+diff --git a/packages/shylu/shylu_node/hts/src/CMakeLists.txt b/packages/shylu/shylu_node/hts/src/CMakeLists.txt
+index 2fe54263..2ba575c3 100644
+--- a/packages/shylu/shylu_node/hts/src/CMakeLists.txt
++++ b/packages/shylu/shylu_node/hts/src/CMakeLists.txt
+@@ -19,7 +19,7 @@ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ SET(SOURCES shylu_hts.cpp)
+ SET(HEADERS_PUBLIC shylu_hts.hpp shylu_hts_decl.hpp shylu_hts_impl.hpp shylu_hts_impl_def.hpp)
+diff --git a/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2015/src/CMakeLists.txt b/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2015/src/CMakeLists.txt
+index 06c97a40..54561e2d 100644
+--- a/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2015/src/CMakeLists.txt
++++ b/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2015/src/CMakeLists.txt
+@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+diff --git a/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2016/src/CMakeLists.txt b/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2016/src/CMakeLists.txt
+index 61192d2c..739cbab2 100644
+--- a/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2016/src/CMakeLists.txt
++++ b/packages/shylu/shylu_node/tacho/deprecated/tacho-ver2016/src/CMakeLists.txt
+@@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+diff --git a/packages/shylu/shylu_node/tacho/src/CMakeLists.txt b/packages/shylu/shylu_node/tacho/src/CMakeLists.txt
+index 7e140d8b..6f701c40 100644
+--- a/packages/shylu/shylu_node/tacho/src/CMakeLists.txt
++++ b/packages/shylu/shylu_node/tacho/src/CMakeLists.txt
+@@ -26,7 +26,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+ #-----------------------------------------------------------------------------
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ #-----------------------------------------------------------------------------
+ 
+diff --git a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
+index e4b45031..4cb823f9 100644
+--- a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt
+@@ -21,5 +21,5 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/)
+ 
+diff --git a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
+index ef47a267..9bef4bec 100644
+--- a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt
+@@ -46,4 +46,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
+diff --git a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
+index cf6032d3..e23213f9 100644
+--- a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt
+@@ -49,7 +49,7 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
+ 
+ # AGS: I moved this to the bottom so that the link order was correct
+ # with  -lstk_io_uti before -lstk_io.  I think the DEPLIBS added in
+diff --git a/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
+index e5befd0d..a5e991e7 100644
+--- a/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt
+@@ -45,4 +45,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
+diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
+index fc50a5b0..751e1f69 100644
+--- a/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt
+@@ -54,7 +54,7 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
+ 
+ INSTALL(FILES ${HEADERS_IMPL} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
+diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
+index 54ef03ed..90ac4e04 100644
+--- a/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt
+@@ -48,5 +48,5 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/)
+ 
+diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+index 18e8e081..283784d5 100644
+--- a/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+@@ -54,4 +54,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/)
+diff --git a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
+index 9a6f4cc1..f530589d 100644
+--- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt
+@@ -46,4 +46,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/)
+diff --git a/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt b/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
+index e13d37cd..f1ad5584 100644
+--- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
+@@ -18,4 +18,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-  ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
++  ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils)
+diff --git a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
+index 62e9b601..7fc256a1 100644
+--- a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt
+@@ -62,4 +62,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+diff --git a/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt b/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
+index 63d60b9f..cd0ea2bf 100644
+--- a/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt
+@@ -34,5 +34,5 @@ ENDIF()
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/)
+ 
+diff --git a/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt b/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
+index 925daf5c..ddb06097 100644
+--- a/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
+@@ -54,4 +54,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ #INSTALL(FILES ${HEADERS} DESTINATION
+-#    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
++#    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+diff --git a/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
+index 4a91d34e..c00793d5 100644
+--- a/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt
+@@ -16,6 +16,6 @@ ENDIF()
+ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
+ 
+ INSTALL(FILES stk_config.h DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STKClassic_config.h DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+diff --git a/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
+index 2c0dea4e..51d0013e 100644
+--- a/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt
+@@ -82,5 +82,5 @@ TRIBITS_ADD_LIBRARY(
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
+ 
+diff --git a/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
+index 93fc5a94..ccb9f10c 100644
+--- a/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt
+@@ -80,4 +80,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-        ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
++        ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
+diff --git a/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
+index 1640ef50..65d39479 100644
+--- a/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt
+@@ -61,4 +61,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
+diff --git a/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
+index 769bd69f..9ea0e079 100644
+--- a/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt
+@@ -50,4 +50,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
+diff --git a/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
+index 4585b226..b5be334b 100644
+--- a/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt
+@@ -49,4 +49,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ #INSTALL(FILES ${HEADERS} DESTINATION
+-#    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/)
++#    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/)
+diff --git a/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
+index b49c92e7..32aaaf0b 100644
+--- a/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
++++ b/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt
+@@ -46,4 +46,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
+diff --git a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
+index 66e4eb87..502858f4 100644
+--- a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
++++ b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
+@@ -77,4 +77,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval)
+diff --git a/packages/stk/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_io/stk_io/CMakeLists.txt
+index eac6ed04..05b65b69 100644
+--- a/packages/stk/stk_io/stk_io/CMakeLists.txt
++++ b/packages/stk/stk_io/stk_io/CMakeLists.txt
+@@ -78,7 +78,7 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/)
+ 
+ # AGS: I moved this to the bottom so that the link order was correct
+ # with  -lstk_io_uti before -lstk_io.  I think the DEPLIBS added in
+diff --git a/packages/stk/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_io/stk_io/util/CMakeLists.txt
+index 687821fb..4c25d53b 100644
+--- a/packages/stk/stk_io/stk_io/util/CMakeLists.txt
++++ b/packages/stk/stk_io/stk_io/util/CMakeLists.txt
+@@ -76,4 +76,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/)
+diff --git a/packages/stk/stk_math/stk_math/CMakeLists.txt b/packages/stk/stk_math/stk_math/CMakeLists.txt
+index 02f9a03b..b1b37886 100644
+--- a/packages/stk/stk_math/stk_math/CMakeLists.txt
++++ b/packages/stk/stk_math/stk_math/CMakeLists.txt
+@@ -69,4 +69,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_math)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_math)
+diff --git a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
+index 67bab20c..5523be60 100644
+--- a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
++++ b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
+@@ -84,14 +84,14 @@ TRIBITS_ADD_LIBRARY(
+ TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/)
+ 
+ INSTALL(FILES ${HEADERS_IMPL} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/)
+ 
+ INSTALL(FILES ${HEADERS_ELEMGRAPH} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph)
+ 
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h DESTINATION
+-        ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++        ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+diff --git a/packages/stk/stk_ngp/stk_ngp/CMakeLists.txt b/packages/stk/stk_ngp/stk_ngp/CMakeLists.txt
+index 69f80d2f..0ae44d17 100644
+--- a/packages/stk/stk_ngp/stk_ngp/CMakeLists.txt
++++ b/packages/stk/stk_ngp/stk_ngp/CMakeLists.txt
+@@ -77,5 +77,5 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_ngp/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_ngp/)
+ 
+diff --git a/packages/stk/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_search/stk_search/CMakeLists.txt
+index ae6cc042..199c82f3 100644
+--- a/packages/stk/stk_search/stk_search/CMakeLists.txt
++++ b/packages/stk/stk_search/stk_search/CMakeLists.txt
+@@ -69,4 +69,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search)
+diff --git a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
+index ca6e439b..dd460d43 100644
+--- a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
++++ b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt
+@@ -68,5 +68,5 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util)
+     
+diff --git a/packages/stk/stk_simd/stk_math/CMakeLists.txt b/packages/stk/stk_simd/stk_math/CMakeLists.txt
+index 2c5028c1..7c1ba46f 100644
+--- a/packages/stk/stk_simd/stk_math/CMakeLists.txt
++++ b/packages/stk/stk_simd/stk_math/CMakeLists.txt
+@@ -64,5 +64,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_math)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_math)
+ 
+diff --git a/packages/stk/stk_simd/stk_simd/CMakeLists.txt b/packages/stk/stk_simd/stk_simd/CMakeLists.txt
+index 68dee725..9c987fe5 100644
+--- a/packages/stk/stk_simd/stk_simd/CMakeLists.txt
++++ b/packages/stk/stk_simd/stk_simd/CMakeLists.txt
+@@ -69,5 +69,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/)
+ 
+diff --git a/packages/stk/stk_simd/stk_simd/avx/CMakeLists.txt b/packages/stk/stk_simd/stk_simd/avx/CMakeLists.txt
+index 1cf5b6ae..b06b0000 100644
+--- a/packages/stk/stk_simd/stk_simd/avx/CMakeLists.txt
++++ b/packages/stk/stk_simd/stk_simd/avx/CMakeLists.txt
+@@ -64,5 +64,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/avx)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/avx)
+ 
+diff --git a/packages/stk/stk_simd/stk_simd/avx512/CMakeLists.txt b/packages/stk/stk_simd/stk_simd/avx512/CMakeLists.txt
+index adc5405c..db59bce6 100644
+--- a/packages/stk/stk_simd/stk_simd/avx512/CMakeLists.txt
++++ b/packages/stk/stk_simd/stk_simd/avx512/CMakeLists.txt
+@@ -64,5 +64,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/avx512)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/avx512)
+ 
+diff --git a/packages/stk/stk_simd/stk_simd/no_simd/CMakeLists.txt b/packages/stk/stk_simd/stk_simd/no_simd/CMakeLists.txt
+index 7baf7094..66529920 100644
+--- a/packages/stk/stk_simd/stk_simd/no_simd/CMakeLists.txt
++++ b/packages/stk/stk_simd/stk_simd/no_simd/CMakeLists.txt
+@@ -64,5 +64,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/no_simd)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/no_simd)
+ 
+diff --git a/packages/stk/stk_simd/stk_simd/sse/CMakeLists.txt b/packages/stk/stk_simd/stk_simd/sse/CMakeLists.txt
+index 970cbc6c..31d209df 100644
+--- a/packages/stk/stk_simd/stk_simd/sse/CMakeLists.txt
++++ b/packages/stk/stk_simd/stk_simd/sse/CMakeLists.txt
+@@ -64,5 +64,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/sse)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd/sse)
+ 
+diff --git a/packages/stk/stk_simd/stk_simd_view/CMakeLists.txt b/packages/stk/stk_simd/stk_simd_view/CMakeLists.txt
+index b1b5c343..0849bbde 100644
+--- a/packages/stk/stk_simd/stk_simd_view/CMakeLists.txt
++++ b/packages/stk/stk_simd/stk_simd_view/CMakeLists.txt
+@@ -64,5 +64,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd_view)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_simd_view)
+ 
+diff --git a/packages/stk/stk_tools/stk_tools/CMakeLists.txt b/packages/stk/stk_tools/stk_tools/CMakeLists.txt
+index 4a540bf6..c0ec799d 100644
+--- a/packages/stk/stk_tools/stk_tools/CMakeLists.txt
++++ b/packages/stk/stk_tools/stk_tools/CMakeLists.txt
+@@ -68,10 +68,10 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${MESH_CLONE_HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_tools/mesh_clone)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_tools/mesh_clone)
+ 
+ INSTALL(FILES ${BLOCK_EXTRACTOR_HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_tools/block_extractor)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_tools/block_extractor)
+ 
+ #
+ #Disabling due to undefined reference to `stk::parallel::require(bool, std::string const&, ompi_communicator_t*)'
+diff --git a/packages/stk/stk_topology/stk_topology/CMakeLists.txt b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
+index 6898eeae..66624592 100644
+--- a/packages/stk/stk_topology/stk_topology/CMakeLists.txt
++++ b/packages/stk/stk_topology/stk_topology/CMakeLists.txt
+@@ -71,7 +71,7 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/)
+ 
+ INSTALL(FILES ${DETAIL_HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail)
+diff --git a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
+index e9d96efe..d2fbc2d4 100644
+--- a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
++++ b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt
+@@ -5,7 +5,7 @@
+ FILE(GLOB HEADERS *.hpp)
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/)
+ 
+ FILE(GLOB HEADERS_IMPL ${CMAKE_CURRENT_SOURCE_DIR}/copy_by_id/*.hpp)
+ FILE(GLOB SOURCES_IMPL  ${CMAKE_CURRENT_SOURCE_DIR}/copy_by_id/*.cpp)
+diff --git a/packages/stk/stk_unit_test_utils/CMakeLists.txt b/packages/stk/stk_unit_test_utils/CMakeLists.txt
+index 91d65277..c5954a00 100644
+--- a/packages/stk/stk_unit_test_utils/CMakeLists.txt
++++ b/packages/stk/stk_unit_test_utils/CMakeLists.txt
+@@ -12,7 +12,7 @@ FILE(GLOB SOURCES *.cpp)
+ LIST(REMOVE_ITEM SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/unittestMeshUtils.cpp")
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_unit_test_utils/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_unit_test_utils/)
+     
+ TRIBITS_ADD_LIBRARY(
+   stk_unit_test_utils
+diff --git a/packages/stk/stk_unit_test_utils/comparison/CMakeLists.txt b/packages/stk/stk_unit_test_utils/comparison/CMakeLists.txt
+index 175fe199..5a1deca6 100644
+--- a/packages/stk/stk_unit_test_utils/comparison/CMakeLists.txt
++++ b/packages/stk/stk_unit_test_utils/comparison/CMakeLists.txt
+@@ -64,5 +64,5 @@ FILE(GLOB HEADERS *.hpp)
+ #
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_unit_test_utils/comparison)
++${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_unit_test_utils/comparison)
+ 
+diff --git a/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt
+index 650aa7da..e21cff44 100644
+--- a/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt
++++ b/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt
+@@ -71,4 +71,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_unit_tests/stk_mesh_fixtures)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_unit_tests/stk_mesh_fixtures)
+diff --git a/packages/stk/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_util/stk_util/CMakeLists.txt
+index 23769cfc..af435ee5 100644
+--- a/packages/stk/stk_util/stk_util/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/CMakeLists.txt
+@@ -22,6 +22,6 @@ TRIBITS_CONFIGURE_FILE(STK_Trilinos_config.h)
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+ 
+ INSTALL(FILES stk_config.h stk_kokkos_macros.h DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STK_Trilinos_config.h DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/)
+diff --git a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
+index 3a862479..951d714c 100644
+--- a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
+@@ -75,5 +75,5 @@ TRIBITS_ADD_LIBRARY(
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/)
+ 
+diff --git a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
+index 50c9e86d..d7387814 100644
+--- a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
+@@ -73,4 +73,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-        ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
++        ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/)
+diff --git a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
+index b6b46350..912c9c6d 100644
+--- a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
+@@ -90,4 +90,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/)
+diff --git a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
+index 0708dfce..ec60609d 100644
+--- a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt
+@@ -70,5 +70,5 @@ TRIBITS_ADD_LIBRARY(
+ 
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/)
+ 
+diff --git a/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt b/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
+index 6b92b6b1..748d27d9 100644
+--- a/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
+@@ -78,4 +78,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/)
+diff --git a/packages/stk/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_util/stk_util/util/CMakeLists.txt
+index b90c66bd..05e40b0f 100644
+--- a/packages/stk/stk_util/stk_util/util/CMakeLists.txt
++++ b/packages/stk/stk_util/stk_util/util/CMakeLists.txt
+@@ -75,4 +75,4 @@ TRIBITS_ADD_LIBRARY(
+   )
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION
+-    ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
++    ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/)
+diff --git a/packages/teuchos/kokkoscompat/src/CMakeLists.txt b/packages/teuchos/kokkoscompat/src/CMakeLists.txt
+index f127249c..1fde480e 100644
+--- a/packages/teuchos/kokkoscompat/src/CMakeLists.txt
++++ b/packages/teuchos/kokkoscompat/src/CMakeLists.txt
+@@ -27,7 +27,7 @@ TRIBITS_ADD_LIBRARY(
+ # FIXME (mfh 19 Dec 2014) We should rely on TriBITS to handle
+ # installation.
+ 
+-SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
++SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR})
+ 
+ INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/)
+ 
+diff --git a/packages/trios/libraries/support/CMakeLists.txt b/packages/trios/libraries/support/CMakeLists.txt
+index 3b8c4fd8..175f736e 100644
+--- a/packages/trios/libraries/support/CMakeLists.txt
++++ b/packages/trios/libraries/support/CMakeLists.txt
+@@ -168,6 +168,6 @@ TRIBITS_ADD_LIBRARY(
+ 
+ ########### install targets ###############
+ 
+-# INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
++# INSTALL(FILES ${MODULES} DESTINATION include)
+ 
+ TRIBITS_SUBPACKAGE_POSTPROCESS()
+diff --git a/packages/zoltan/src/CMakeLists.txt b/packages/zoltan/src/CMakeLists.txt
+index 84f1e824..10a8a893 100644
+--- a/packages/zoltan/src/CMakeLists.txt
++++ b/packages/zoltan/src/CMakeLists.txt
+@@ -681,5 +681,5 @@ TRIBITS_ADD_LIBRARY(
+   IMPORTEDLIBS ${IMPORTEDLIBS}
+   )
+ 
+-INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
++INSTALL(FILES ${MODULES} DESTINATION include)
+ 
+diff --git a/packages/zoltan/src/fdriver/CMakeLists.txt b/packages/zoltan/src/fdriver/CMakeLists.txt
+index 32913f39..8dd9cba6 100644
+--- a/packages/zoltan/src/fdriver/CMakeLists.txt
++++ b/packages/zoltan/src/fdriver/CMakeLists.txt
+@@ -33,6 +33,6 @@ IF(${PROJECT_NAME}_ENABLE_Fortran AND BUILD_ZOLTAN_F90_INTERFACE)
+ 
+ #  What is a good location for executables zdrive and zCPPdrive?
+ #  When should they be moved there?  During install?  Or build?
+-#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
++#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION bin)
+ 
+ ENDIF()

diff --git a/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild b/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
index 432977e10..d5846614c 100644
--- a/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
@@ -61,7 +61,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${P}-Source"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
+	"${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch
 	"${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch
 	"${FILESDIR}"/${P}-fix_sundance_compilation.patch
 	"${FILESDIR}"/${P}-superlu-5.patch

diff --git a/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild b/sci-libs/trilinos/trilinos-12.14.1.ebuild
similarity index 95%
copy from sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
copy to sci-libs/trilinos/trilinos-12.14.1.ebuild
index 432977e10..efe37db93 100644
--- a/sci-libs/trilinos/trilinos-12.12.1-r1.ebuild
+++ b/sci-libs/trilinos/trilinos-12.14.1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 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"
+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"
 
@@ -58,13 +59,11 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-S="${WORKDIR}/${P}-Source"
+S="${WORKDIR}/Trilinos-${PN}-release-${MY_PV}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \
+	"${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch
 	"${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch
-	"${FILESDIR}"/${P}-fix_sundance_compilation.patch
-	"${FILESDIR}"/${P}-superlu-5.patch
 )
 
 trilinos_conf() {
@@ -139,6 +138,7 @@ src_configure() {
 		-DTPL_ENABLE_X11="$(usex X)"
 		-DTPL_ENABLE_yaml-cpp="$(usex yaml)"
 		-DTPL_ENABLE_Zlib="$(usex zlib)"
+		-DML_ENABLE_SuperLU:BOOL=OFF
 	)
 
 	use eigen && \


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2019-04-04  4:00 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-14 15:01 [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/files/, sci-libs/trilinos/ Justin Lecher
  -- strict thread matches above, loose matches on Subject: below --
2019-04-04  4:00 Matthias Maier
2018-03-01 20:18 Matthias Maier
2018-03-01 20:18 Matthias Maier
2016-12-06 19:44 Christoph Junghans
2016-04-23 23:21 Christoph Junghans
2015-07-16 19:42 Jauhien Piatlicki
2015-03-14  8:21 Justin Lecher
2014-12-09 17:58 Christoph Junghans

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox