From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 01CDB1382C5 for ; Mon, 2 Apr 2018 12:45:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 044BAE0D4E; Mon, 2 Apr 2018 12:45:33 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BD4C8E0D4E for ; Mon, 2 Apr 2018 12:45:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A444335DA9 for ; Mon, 2 Apr 2018 12:45:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B349027C for ; Mon, 2 Apr 2018 12:45:28 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1522673122.7185e731bd07735474852ee3669ddc764ef6e7e2.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/trilinos/, sci-libs/trilinos/files/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch sci-libs/trilinos/trilinos-11.14.1-r1.ebuild sci-libs/trilinos/trilinos-12.10.1-r1.ebuild X-VCS-Directories: sci-libs/trilinos/files/ sci-libs/trilinos/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 7185e731bd07735474852ee3669ddc764ef6e7e2 X-VCS-Branch: master Date: Mon, 2 Apr 2018 12:45:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2440a5a5-581f-4f9d-8048-29a693bf966b X-Archives-Hash: 94e7ea05d59dfc719e182a34a20815bc commit: 7185e731bd07735474852ee3669ddc764ef6e7e2 Author: Justin Lecher gentoo org> AuthorDate: Mon Apr 2 12:42:39 2018 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Apr 2 12:45:22 2018 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7185e731 sci-libs/trilinos: Drop old Signed-off-by: Justin Lecher gentoo.org> Package-Manager: Portage-2.3.27, Repoman-2.3.9 Signed-off-by: Justin Lecher gentoo.org> ...nos-11.14.1-fix_install_paths_for_destdir.patch | 617 --------------------- .../files/trilinos-12.10.1-fix_gcc_7.patch | 57 -- ...s-12.10.1-fix_install_paths_for_destdir-2.patch | 10 - ...nos-12.10.1-fix_install_paths_for_destdir.patch | 603 -------------------- sci-libs/trilinos/trilinos-11.14.1-r1.ebuild | 207 ------- sci-libs/trilinos/trilinos-12.10.1-r1.ebuild | 220 -------- 6 files changed, 1714 deletions(-) diff --git a/sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch b/sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch deleted file mode 100644 index e24fc495b..000000000 --- a/sci-libs/trilinos/files/trilinos-11.14.1-fix_install_paths_for_destdir.patch +++ /dev/null @@ -1,617 +0,0 @@ -diff --git a/commonTools/gtest/CMakeLists.txt b/commonTools/gtest/CMakeLists.txt -index 9367010..17f8892 100644 ---- a/commonTools/gtest/CMakeLists.txt -+++ b/commonTools/gtest/CMakeLists.txt -@@ -31,7 +31,7 @@ TRIBITS_ADD_LIBRARY( - ) - - #install gtest header into the correct subdir. --INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/gtest/) -+INSTALL(FILES ${HEADERS} DESTINATION ${Trilinos_INSTALL_INCLUDE_DIR}/gtest/) - - - -diff --git a/packages/kokkos/TPL/CMakeLists.txt b/packages/kokkos/TPL/CMakeLists.txt -index 8119c31..2d74336 100644 ---- a/packages/kokkos/TPL/CMakeLists.txt -+++ b/packages/kokkos/TPL/CMakeLists.txt -@@ -1,7 +1,7 @@ - - TRIBITS_SUBPACKAGE(TPL) - --SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) - - IF( Kokkos_ENABLE_Cuda ) - -diff --git a/packages/kokkos/containers/src/CMakeLists.txt b/packages/kokkos/containers/src/CMakeLists.txt -index da5a791..65a7c76 100644 ---- a/packages/kokkos/containers/src/CMakeLists.txt -+++ b/packages/kokkos/containers/src/CMakeLists.txt -@@ -15,7 +15,7 @@ FILE(GLOB HEADERS *.hpp) - FILE(GLOB HEADERS_IMPL impl/*.hpp) - FILE(GLOB SOURCES impl/*.cpp) - --SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) - - INSTALL(FILES ${HEADERS_IMPL} DESTINATION ${TRILINOS_INCDIR}/impl/) - -diff --git a/packages/kokkos/core/src/CMakeLists.txt b/packages/kokkos/core/src/CMakeLists.txt -index 7e0e150..d1ed33a 100644 ---- a/packages/kokkos/core/src/CMakeLists.txt -+++ b/packages/kokkos/core/src/CMakeLists.txt -@@ -13,7 +13,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) - - #----------------------------------------------------------------------------- - --SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) - - #----------------------------------------------------------------------------- - -diff --git a/packages/kokkos/core/src/impl/CMakeLists.txt b/packages/kokkos/core/src/impl/CMakeLists.txt -index c543194..1021f42 100644 ---- a/packages/kokkos/core/src/impl/CMakeLists.txt -+++ b/packages/kokkos/core/src/impl/CMakeLists.txt -@@ -12,7 +12,7 @@ TRIBITS_ADD_LIBRARY( - DEPLIBS - ) - --SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) - - INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/impl/) - -diff --git a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt -index 573c972..8056913 100644 ---- a/packages/seacas/libraries/ioss/src/init/CMakeLists.txt -+++ b/packages/seacas/libraries/ioss/src/init/CMakeLists.txt -@@ -50,5 +50,5 @@ IF (BUILD_TESTING) - ENDIF (BUILD_TESTING) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/init/) -+ ${Trilinos_INSTALL_INCLUDE_DIR}/init/) - -diff --git a/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt b/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt -index 695b21d..8f2045c 100644 ---- a/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt -@@ -46,7 +46,7 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION --${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/) -+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/) - - ADD_SUBDIRECTORY(main) - -diff --git a/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt b/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt -index db930be..c3cd3b4 100644 ---- a/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt -@@ -34,5 +34,5 @@ ENDIF() - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/) - -diff --git a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt -index ec7f650..a98b073 100644 ---- a/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt -@@ -22,5 +22,5 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/) - -diff --git a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt -index e738def..e8ad166 100644 ---- a/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt -@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) -diff --git a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt -index 38d9b5c..7b1d105 100644 ---- a/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt -@@ -50,7 +50,7 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION --${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) -+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) - - # AGS: I moved this to the bottom so that the link order was correct - # with -lstk_io_uti before -lstk_io. I think the DEPLIBS added in -diff --git a/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt -index 0412574..b15f54a 100644 ---- a/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt -@@ -46,4 +46,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) -diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt -index 71c6697..770eb52 100644 ---- a/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt -@@ -55,7 +55,7 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) - - INSTALL(FILES ${HEADERS_IMPL} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) -diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt -index 844088a..398640d 100644 ---- a/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt -@@ -49,5 +49,5 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/) - -diff --git a/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt -index 7162134..4738933 100644 ---- a/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt -@@ -55,4 +55,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) -diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt -index 854268d..68b3533 100644 ---- a/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt -@@ -68,5 +68,5 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION --${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/) -+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/) - -diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt -index 10868c3..fa854bc 100644 ---- a/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt -@@ -35,5 +35,5 @@ ENDIF() - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/) - -diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt -index a60a1a8..6f2d965 100644 ---- a/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt -@@ -37,5 +37,5 @@ ENDIF() - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/) - -diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt -index ebea648..e6f5344 100644 ---- a/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt -@@ -36,5 +36,5 @@ ENDIF() - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/) - -diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt -index 2b256f1..b27238f 100644 ---- a/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt -@@ -35,5 +35,5 @@ ENDIF() - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/) - -diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt -index 2acb307..411ab23 100644 ---- a/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt -@@ -35,5 +35,5 @@ ENDIF() - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/) - -diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt -index e9c2a8c..2353f6c 100644 ---- a/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt -@@ -35,5 +35,5 @@ ENDIF() - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/) - -diff --git a/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt b/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt -index 63ae85d..3978bf5 100644 ---- a/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt -@@ -35,5 +35,5 @@ ENDIF() - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/) - -diff --git a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt -index 90ab292..930279b 100644 ---- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt -@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/) -diff --git a/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt b/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt -index 2582b19..2f35d7a 100644 ---- a/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt -@@ -19,4 +19,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils) -diff --git a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt -index a70b0b8..3f8d6ac 100644 ---- a/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt -@@ -63,4 +63,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) -diff --git a/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt b/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt -index 55a388e..9a5cbfb 100644 ---- a/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt -@@ -35,5 +35,5 @@ ENDIF() - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/) - -diff --git a/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt b/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt -index 33de7e0..d904256 100644 ---- a/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt -@@ -55,4 +55,4 @@ TRIBITS_ADD_LIBRARY( - ) - - #INSTALL(FILES ${HEADERS} DESTINATION --# ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) -+# ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) -diff --git a/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt -index 4a91d34..c00793d 100644 ---- a/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt -@@ -16,6 +16,6 @@ ENDIF() - TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) - - INSTALL(FILES stk_config.h DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STKClassic_config.h DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -diff --git a/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt -index 354b70c..5b8ec85 100644 ---- a/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt -@@ -83,5 +83,5 @@ TRIBITS_ADD_LIBRARY( - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) - -diff --git a/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt -index 3d295e3..aa5869c 100644 ---- a/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt -@@ -81,4 +81,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) -diff --git a/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt -index f441b60..e64f34d 100644 ---- a/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt -@@ -62,4 +62,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) -diff --git a/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt -index 11fb404..b2225e3 100644 ---- a/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt -@@ -51,4 +51,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) -diff --git a/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt -index ed25e41..9314e7a 100644 ---- a/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt -@@ -50,4 +50,4 @@ TRIBITS_ADD_LIBRARY( - ) - - #INSTALL(FILES ${HEADERS} DESTINATION --# ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/) -+# ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/) -diff --git a/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt -index 56b7873..8d83357 100644 ---- a/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt -+++ b/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt -@@ -47,4 +47,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) -diff --git a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt -index 467dfa1..605aefd 100644 ---- a/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt -+++ b/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt -@@ -78,4 +78,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) -diff --git a/packages/stk/stk_io/stk_io/CMakeLists.txt b/packages/stk/stk_io/stk_io/CMakeLists.txt -index 1cc9609..16e1fe0 100644 ---- a/packages/stk/stk_io/stk_io/CMakeLists.txt -+++ b/packages/stk/stk_io/stk_io/CMakeLists.txt -@@ -80,7 +80,7 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION --${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) -+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) - - # AGS: I moved this to the bottom so that the link order was correct - # with -lstk_io_uti before -lstk_io. I think the DEPLIBS added in -diff --git a/packages/stk/stk_io/stk_io/util/CMakeLists.txt b/packages/stk/stk_io/stk_io/util/CMakeLists.txt -index beee08b..1d78255 100644 ---- a/packages/stk/stk_io/stk_io/util/CMakeLists.txt -+++ b/packages/stk/stk_io/stk_io/util/CMakeLists.txt -@@ -77,4 +77,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) -diff --git a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt -index 5db69c1..9e60c2e 100644 ---- a/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt -+++ b/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt -@@ -80,7 +80,7 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) - - INSTALL(FILES ${HEADERS_IMPL} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) -diff --git a/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt -index f28c06c..c5e817e 100644 ---- a/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt -+++ b/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt -@@ -72,4 +72,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) -diff --git a/packages/stk/stk_search/stk_search/CMakeLists.txt b/packages/stk/stk_search/stk_search/CMakeLists.txt -index ae6cc04..199c82f 100644 ---- a/packages/stk/stk_search/stk_search/CMakeLists.txt -+++ b/packages/stk/stk_search/stk_search/CMakeLists.txt -@@ -69,4 +69,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) -diff --git a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt -index ca6e439..dd460d4 100644 ---- a/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt -+++ b/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt -@@ -68,5 +68,5 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util) - -diff --git a/packages/stk/stk_topology/stk_topology/CMakeLists.txt b/packages/stk/stk_topology/stk_topology/CMakeLists.txt -index 7364267..f1d03d3 100644 ---- a/packages/stk/stk_topology/stk_topology/CMakeLists.txt -+++ b/packages/stk/stk_topology/stk_topology/CMakeLists.txt -@@ -72,7 +72,7 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/) - - INSTALL(FILES ${DETAIL_HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail) -diff --git a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt -index 667cb5d..ce11394 100644 ---- a/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt -+++ b/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt -@@ -5,4 +5,4 @@ - FILE(GLOB HEADERS *.hpp) - - INSTALL(FILES ${HEADERS} DESTINATION --${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/) -+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/) -diff --git a/packages/stk/stk_util/stk_util/CMakeLists.txt b/packages/stk/stk_util/stk_util/CMakeLists.txt -index 02f4bf2..e95b05c 100644 ---- a/packages/stk/stk_util/stk_util/CMakeLists.txt -+++ b/packages/stk/stk_util/stk_util/CMakeLists.txt -@@ -18,6 +18,6 @@ TRIBITS_CONFIGURE_FILE(STK_Trilinos_config.h) - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) - - INSTALL(FILES stk_config.h DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STK_Trilinos_config.h DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) -diff --git a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt -index 32115b6..184062a 100644 ---- a/packages/stk/stk_util/stk_util/diag/CMakeLists.txt -+++ b/packages/stk/stk_util/stk_util/diag/CMakeLists.txt -@@ -76,5 +76,5 @@ TRIBITS_ADD_LIBRARY( - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) - -diff --git a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt -index f3ecc5d..8268018 100644 ---- a/packages/stk/stk_util/stk_util/environment/CMakeLists.txt -+++ b/packages/stk/stk_util/stk_util/environment/CMakeLists.txt -@@ -74,4 +74,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) -diff --git a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt -index 51e11fd..dba3e15 100644 ---- a/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt -+++ b/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt -@@ -93,4 +93,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) -diff --git a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt -index 2fa8a9b..dbc5000 100644 ---- a/packages/stk/stk_util/stk_util/registry/CMakeLists.txt -+++ b/packages/stk/stk_util/stk_util/registry/CMakeLists.txt -@@ -71,5 +71,5 @@ TRIBITS_ADD_LIBRARY( - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/) - -diff --git a/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt b/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt -index 4a39491..ed521a4 100644 ---- a/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt -+++ b/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt -@@ -79,4 +79,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) -diff --git a/packages/stk/stk_util/stk_util/util/CMakeLists.txt b/packages/stk/stk_util/stk_util/util/CMakeLists.txt -index b12d75e..054f60d 100644 ---- a/packages/stk/stk_util/stk_util/util/CMakeLists.txt -+++ b/packages/stk/stk_util/stk_util/util/CMakeLists.txt -@@ -76,4 +76,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) -diff --git a/packages/teuchos/kokkoscompat/src/CMakeLists.txt b/packages/teuchos/kokkoscompat/src/CMakeLists.txt -index 44e6593..7048850 100644 ---- a/packages/teuchos/kokkoscompat/src/CMakeLists.txt -+++ b/packages/teuchos/kokkoscompat/src/CMakeLists.txt -@@ -35,7 +35,7 @@ ENDIF() - # FIXME (mfh 19 Dec 2014) We should rely on TriBITS to handle - # installation. - --SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) - - INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/) - -diff --git a/packages/trios/libraries/support/CMakeLists.txt b/packages/trios/libraries/support/CMakeLists.txt -index 3b8c4fd..175f736 100644 ---- a/packages/trios/libraries/support/CMakeLists.txt -+++ b/packages/trios/libraries/support/CMakeLists.txt -@@ -168,6 +168,6 @@ TRIBITS_ADD_LIBRARY( - - ########### install targets ############### - --# INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) -+# INSTALL(FILES ${MODULES} DESTINATION include) - - TRIBITS_SUBPACKAGE_POSTPROCESS() -diff --git a/packages/zoltan/src/CMakeLists.txt b/packages/zoltan/src/CMakeLists.txt -index c312433..8a52ec4 100644 ---- a/packages/zoltan/src/CMakeLists.txt -+++ b/packages/zoltan/src/CMakeLists.txt -@@ -678,5 +678,5 @@ TRIBITS_ADD_LIBRARY( - IMPORTEDLIBS ${IMPORTEDLIBS} - ) - --INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) -+INSTALL(FILES ${MODULES} DESTINATION include) - -diff --git a/packages/zoltan/src/fdriver/CMakeLists.txt b/packages/zoltan/src/fdriver/CMakeLists.txt -index 64345d3..e60c2e3 100644 ---- a/packages/zoltan/src/fdriver/CMakeLists.txt -+++ b/packages/zoltan/src/fdriver/CMakeLists.txt -@@ -35,6 +35,6 @@ TRIBITS_ADD_EXECUTABLE( - - # What is a good location for executables zdrive and zCPPdrive? - # When should they be moved there? During install? Or build? --#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -+#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION bin) - - ENDIF() diff --git a/sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch b/sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch deleted file mode 100644 index cb005cbd3..000000000 --- a/sci-libs/trilinos/files/trilinos-12.10.1-fix_gcc_7.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/packages/stk/stk_util/stk_util/diag/StringUtil.cpp b/packages/stk/stk_util/stk_util/diag/StringUtil.cpp -index eb9c7c1..942cfad 100644 ---- a/packages/stk/stk_util/stk_util/diag/StringUtil.cpp -+++ b/packages/stk/stk_util/stk_util/diag/StringUtil.cpp -@@ -40,7 +40,7 @@ - #include // for basic_string, string, etc - #include "stk_util/diag/String.hpp" // for String - --#if __GNUC__ == 3 || __GNUC__ == 4 || __GNUC__ == 5 || __GNUC__ == 6 -+#if __GNUC__ == 3 || __GNUC__ == 4 || __GNUC__ == 5 || __GNUC__ == 6 || __GNUC__ == 7 - #include - #endif - -@@ -314,7 +314,7 @@ word_wrap( - #endif - } - -- #elif (__GNUC__ == 5) -+ #elif (__GNUC__ >= 5) - std::string - demangle(const char * symbol) - { -@@ -338,33 +338,8 @@ word_wrap( - return s; - #endif - } -- -- #elif (__GNUC__ == 6) -- std::string -- demangle(const char * symbol) -- { -- #ifdef PURIFY_BUILD -- return symbol; -- #else -- std::string s; -- -- int status = -1; -- -- char *demangled_symbol = abi::__cxa_demangle(symbol, 0, 0, &status); - -- if (demangled_symbol) { -- s = std::string(demangled_symbol); -- free(demangled_symbol); -- } -- -- if (status != 0) -- s = std::string(symbol); -- -- return s; -- #endif -- } -- -- #endif // (__GNUC__ == 3) -+ #endif - - #else - diff --git a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch deleted file mode 100644 index 52ddc7669..000000000 --- a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir-2.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt -index 8f9fa8f..e57d25f 100644 ---- a/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt -+++ b/packages/stk/stk_unit_tests/stk_mesh_fixtures/CMakeLists.txt -@@ -71,4 +71,4 @@ TRIBITS_ADD_LIBRARY( - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) diff --git a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch b/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch deleted file mode 100644 index 2e8960e23..000000000 --- a/sci-libs/trilinos/files/trilinos-12.10.1-fix_install_paths_for_destdir.patch +++ /dev/null @@ -1,603 +0,0 @@ -diff -Naur trilinos-12.10.1-Source.orig/commonTools/gtest/CMakeLists.txt trilinos-12.10.1-Source/commonTools/gtest/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/commonTools/gtest/CMakeLists.txt 2016-12-05 13:46:36.981584433 -0700 -+++ trilinos-12.10.1-Source/commonTools/gtest/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -31,7 +31,7 @@ - ) - - #install gtest header into the correct subdir. --INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${Trilinos_INSTALL_INCLUDE_DIR}/gtest/) -+INSTALL(FILES ${HEADERS} DESTINATION ${Trilinos_INSTALL_INCLUDE_DIR}/gtest/) - - - -diff -Naur trilinos-12.10.1-Source.orig/packages/kokkos/containers/src/CMakeLists.txt trilinos-12.10.1-Source/packages/kokkos/containers/src/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/kokkos/containers/src/CMakeLists.txt 2016-12-05 13:46:37.071535392 -0700 -+++ trilinos-12.10.1-Source/packages/kokkos/containers/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -15,7 +15,7 @@ - FILE(GLOB HEADERS_IMPL impl/*.hpp) - FILE(GLOB SOURCES impl/*.cpp) - --SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) - - INSTALL(FILES ${HEADERS_IMPL} DESTINATION ${TRILINOS_INCDIR}/impl/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/kokkos/core/src/CMakeLists.txt trilinos-12.10.1-Source/packages/kokkos/core/src/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/kokkos/core/src/CMakeLists.txt 2016-12-05 13:46:37.061540841 -0700 -+++ trilinos-12.10.1-Source/packages/kokkos/core/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -40,7 +40,7 @@ - - #----------------------------------------------------------------------------- - --SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) - - #----------------------------------------------------------------------------- - -diff -Naur trilinos-12.10.1-Source.orig/packages/kokkos/core/src/impl/CMakeLists.txt trilinos-12.10.1-Source/packages/kokkos/core/src/impl/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/kokkos/core/src/impl/CMakeLists.txt 2016-12-05 13:46:37.061540841 -0700 -+++ trilinos-12.10.1-Source/packages/kokkos/core/src/impl/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -12,7 +12,7 @@ - DEPLIBS - ) - --SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) - - INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/impl/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/belos/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/belos/src/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/rol/adapters/belos/src/CMakeLists.txt 2016-12-05 13:46:37.111513596 -0700 -+++ trilinos-12.10.1-Source/packages/rol/adapters/belos/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -39,4 +39,4 @@ - ) - ENDIF() - --INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/epetra/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/epetra/src/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/rol/adapters/epetra/src/CMakeLists.txt 2016-12-05 13:46:37.111513596 -0700 -+++ trilinos-12.10.1-Source/packages/rol/adapters/epetra/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -42,4 +42,4 @@ - ) - ENDIF() - --INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/sacado/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/sacado/src/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/rol/adapters/sacado/src/CMakeLists.txt 2016-12-05 13:46:37.101519046 -0700 -+++ trilinos-12.10.1-Source/packages/rol/adapters/sacado/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -37,4 +37,4 @@ - ) - ENDIF() - --INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/teuchos/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/teuchos/src/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/rol/adapters/teuchos/src/CMakeLists.txt 2016-12-05 13:46:37.101519046 -0700 -+++ trilinos-12.10.1-Source/packages/rol/adapters/teuchos/src/CMakeLists.txt 2016-12-05 14:37:03.361602958 -0700 -@@ -35,4 +35,4 @@ - ) - - --INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/thyra/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/thyra/src/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/rol/adapters/thyra/src/CMakeLists.txt 2016-12-05 13:46:37.111513596 -0700 -+++ trilinos-12.10.1-Source/packages/rol/adapters/thyra/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -49,4 +49,4 @@ - ) - ENDIF() - --INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -diff -Naur trilinos-12.10.1-Source.orig/packages/rol/adapters/tpetra/src/CMakeLists.txt trilinos-12.10.1-Source/packages/rol/adapters/tpetra/src/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/rol/adapters/tpetra/src/CMakeLists.txt 2016-12-05 13:46:37.111513596 -0700 -+++ trilinos-12.10.1-Source/packages/rol/adapters/tpetra/src/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -46,4 +46,4 @@ - ) - ENDIF() - --INSTALL(FILES ${HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+INSTALL(FILES ${HEADERS} DESTINATION ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -46,7 +46,7 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION --${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/) -+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/) - - ADD_SUBDIRECTORY(main) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_adapt/stk_adapt/sierra_element/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -34,5 +34,5 @@ - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_adapt/sierra_element/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_algsup/stk_algsup/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -21,5 +21,5 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_algsup/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_expreval/stk_expreval/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -46,4 +46,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -49,7 +49,7 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION --${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) -+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) - - # AGS: I moved this to the bottom so that the link order was correct - # with -lstk_io_uti before -lstk_io. I think the DEPLIBS added in -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_io/stk_io/util/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -45,4 +45,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/base/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -54,7 +54,7 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) - - INSTALL(FILES ${HEADERS_IMPL} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fem/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -48,5 +48,5 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fem/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_mesh/stk_mesh/fixtures/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -54,4 +54,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -68,5 +68,5 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION --${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/) -+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/fixtures/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -35,5 +35,5 @@ - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/fixtures/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -37,5 +37,5 @@ - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/function/internal/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -36,5 +36,5 @@ - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/function/internal/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/math/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -35,5 +35,5 @@ - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/math/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/mesh/gen/CMakeLists.txt 2016-12-05 13:53:32.265171949 -0700 -@@ -35,5 +35,5 @@ - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/mesh/gen/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/norm/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -35,5 +35,5 @@ - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/norm/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_percept/stk_percept/util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -35,5 +35,5 @@ - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_percept/util/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -46,4 +46,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_rebalance/stk_rebalance_utils/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -18,4 +18,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_rebalance_utils) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -62,4 +62,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt 2016-12-05 13:46:37.381366472 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search/stk_search/diag/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -34,5 +34,5 @@ - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search/diag/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -54,4 +54,4 @@ - ) - - #INSTALL(FILES ${HEADERS} DESTINATION --# ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) -+# ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -16,6 +16,6 @@ - TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) - - INSTALL(FILES stk_config.h DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STKClassic_config.h DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/diag/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -82,5 +82,5 @@ - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/environment/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -80,4 +80,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/parallel/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -61,4 +61,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/unit_test_support/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -50,4 +50,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/use_cases/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -49,4 +49,4 @@ - ) - - #INSTALL(FILES ${HEADERS} DESTINATION --# ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/) -+# ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/use_cases/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt 2016-12-05 13:46:37.391361023 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_classic/stk_util/stk_util/util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -46,4 +46,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -77,4 +77,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_expreval) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -78,7 +78,7 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION --${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) -+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/) - - # AGS: I moved this to the bottom so that the link order was correct - # with -lstk_io_uti before -lstk_io. I think the DEPLIBS added in -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/util/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_io/stk_io/util/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_io/stk_io/util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -76,4 +76,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_io/util/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2016-12-05 13:46:37.421344676 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -84,14 +84,13 @@ - TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/base/) - - INSTALL(FILES ${HEADERS_IMPL} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/) - - INSTALL(FILES ${HEADERS_ELEMGRAPH} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/baseImpl/elementGraph) - - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -- -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt 2016-12-05 13:46:37.421344676 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -71,4 +71,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_mesh/fixtures/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_search/stk_search/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_search/stk_search/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_search/stk_search/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_search/stk_search/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -69,4 +69,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt 2016-12-05 13:46:37.431339227 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_search_util/stk_search_util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -68,5 +68,5 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_search_util) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_topology/stk_topology/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_topology/stk_topology/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_topology/stk_topology/CMakeLists.txt 2016-12-05 13:46:37.401355574 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_topology/stk_topology/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -71,7 +71,7 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/) - - INSTALL(FILES ${DETAIL_HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_topology/topology_detail) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt 2016-12-05 13:46:37.431339227 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_transfer/stk_transfer/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -5,4 +5,4 @@ - FILE(GLOB HEADERS *.hpp) - - INSTALL(FILES ${HEADERS} DESTINATION --${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/) -+${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_transfer/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/CMakeLists.txt 2016-12-05 13:56:03.782564712 -0700 -@@ -18,6 +18,6 @@ - INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) - - INSTALL(FILES stk_config.h stk_kokkos_macros.h DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/STK_Trilinos_config.h DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/diag/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -75,5 +75,5 @@ - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/diag/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/environment/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -73,4 +73,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/environment/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -92,4 +92,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/parallel/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/registry/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/registry/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/registry/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/registry/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -70,5 +70,5 @@ - - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/registry/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -78,4 +78,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/unit_test_support/) -diff -Naur trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/util/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2016-12-05 13:46:37.411350125 -0700 -+++ trilinos-12.10.1-Source/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -75,4 +75,4 @@ - ) - - INSTALL(FILES ${HEADERS} DESTINATION -- ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) -+ ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}/stk_util/util/) -diff -Naur trilinos-12.10.1-Source.orig/packages/teuchos/kokkoscompat/src/CMakeLists.txt trilinos-12.10.1-Source/packages/teuchos/kokkoscompat/src/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/teuchos/kokkoscompat/src/CMakeLists.txt 2016-12-05 13:46:37.371371921 -0700 -+++ trilinos-12.10.1-Source/packages/teuchos/kokkoscompat/src/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -27,7 +27,7 @@ - # FIXME (mfh 19 Dec 2014) We should rely on TriBITS to handle - # installation. - --SET(TRILINOS_INCDIR ${CMAKE_INSTALL_PREFIX}/${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) -+SET(TRILINOS_INCDIR ${${PROJECT_NAME}_INSTALL_INCLUDE_DIR}) - - INSTALL(FILES ${HEADERS} DESTINATION ${TRILINOS_INCDIR}/) - -diff -Naur trilinos-12.10.1-Source.orig/packages/trios/libraries/support/CMakeLists.txt trilinos-12.10.1-Source/packages/trios/libraries/support/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/trios/libraries/support/CMakeLists.txt 2016-12-05 13:46:37.531284737 -0700 -+++ trilinos-12.10.1-Source/packages/trios/libraries/support/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -168,6 +168,6 @@ - - ########### install targets ############### - --# INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) -+# INSTALL(FILES ${MODULES} DESTINATION include) - - TRIBITS_SUBPACKAGE_POSTPROCESS() -diff -Naur trilinos-12.10.1-Source.orig/packages/zoltan/src/CMakeLists.txt trilinos-12.10.1-Source/packages/zoltan/src/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/zoltan/src/CMakeLists.txt 2016-12-05 13:46:37.231448208 -0700 -+++ trilinos-12.10.1-Source/packages/zoltan/src/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -678,5 +678,5 @@ - IMPORTEDLIBS ${IMPORTEDLIBS} - ) - --INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) -+INSTALL(FILES ${MODULES} DESTINATION include) - -diff -Naur trilinos-12.10.1-Source.orig/packages/zoltan/src/fdriver/CMakeLists.txt trilinos-12.10.1-Source/packages/zoltan/src/fdriver/CMakeLists.txt ---- trilinos-12.10.1-Source.orig/packages/zoltan/src/fdriver/CMakeLists.txt 2016-12-05 13:46:37.231448208 -0700 -+++ trilinos-12.10.1-Source/packages/zoltan/src/fdriver/CMakeLists.txt 2016-12-05 13:53:32.275166500 -0700 -@@ -33,6 +33,6 @@ - - # What is a good location for executables zdrive and zCPPdrive? - # When should they be moved there? During install? Or build? --#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) -+#INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zfdrive.exe DESTINATION bin) - - ENDIF() diff --git a/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild b/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild deleted file mode 100644 index 0712f8623..000000000 --- a/sci-libs/trilinos/trilinos-11.14.1-r1.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils toolchain-funcs multilib toolchain-funcs - -DESCRIPTION="Scientific library collection for large scale problems" -HOMEPAGE="http://trilinos.sandia.gov/" -SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz" - -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -LICENSE="BSD LGPL-2.1" -SLOT="0" - -IUSE=" - adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre - matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse - superlu taucs tbb test threads tvmet yaml zlib -" - -# TODO: fix export cmake function for tests -RESTRICT="test" - -RDEPEND=" - sys-libs/binutils-libs - virtual/blas - virtual/lapack - virtual/mpi - adolc? ( sci-libs/adolc ) - arprec? ( sci-libs/arprec ) - boost? ( dev-libs/boost ) - clp? ( sci-libs/coinor-clp ) - cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) - eigen? ( dev-cpp/eigen:3 ) - gtest? ( dev-cpp/gtest ) - hdf5? ( sci-libs/hdf5[mpi] ) - hypre? ( sci-libs/hypre ) - hwloc? ( sys-apps/hwloc ) - matio? ( sci-libs/matio ) - mkl? ( sci-libs/mkl ) - metis? ( || ( sci-libs/parmetis sci-libs/metis ) ) - mumps? ( sci-libs/mumps ) - netcdf? ( sci-libs/netcdf ) - petsc? ( sci-mathematics/petsc ) - qd? ( sci-libs/qd ) - qt4? ( dev-qt/qtgui:4 ) - scalapack? ( virtual/scalapack ) - scotch? ( sci-libs/scotch ) - sparse? ( sci-libs/cxsparse sci-libs/umfpack ) - superlu? ( sci-libs/superlu ) - taucs? ( sci-libs/taucs ) - tbb? ( dev-cpp/tbb ) - tvmet? ( dev-libs/tvmet ) - yaml? ( dev-cpp/yaml-cpp ) - zlib? ( sys-libs/zlib )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${P}-Source" - -trilinos_conf() { - local dirs libs d - for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do - dirs="${dirs};${d:2}" - done - [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" ) - for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do - libs="${libs};${d:2}" - done - [[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" ) - dirs="" - for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do - dirs="${dirs};${d:2}" - done - [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" ) -} - -trilinos_enable() { - cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}} -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-fix-install-paths.patch - epatch "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch -} - -src_configure() { - - # temporarily disable SEACAS and pyTrilinos compilation - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DCMAKE_INSTALL_PREFIX="${EPREFIX}" - -DTrilinos_ENABLE_ALL_PACKAGES=ON - -DTrilinos_ENABLE_SEACAS=OFF - -DTrilinos_ENABLE_PyTrilinos=OFF - -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos" - -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos" - -DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake" - -DTPL_ENABLE_BinUtils=ON - -DTPL_ENABLE_MPI=ON - -DTPL_ENABLE_BLAS=ON - -DTPL_ENABLE_LAPACK=ON - $(cmake-utils_use test Trilinos_ENABLE_TESTS) - $(trilinos_enable adolc) - $(trilinos_enable arprec) - $(trilinos_enable boost Boost) - $(trilinos_enable boost BoostLib) - $(trilinos_enable cppunit Cppunit) - $(trilinos_enable clp Clp) - $(trilinos_enable cuda) - $(trilinos_enable cuda CUSPARSE) - $(trilinos_enable cuda Thrust) - $(trilinos_enable eigen Eigen) - $(trilinos_enable gtest gtest) - $(trilinos_enable glpk) - $(trilinos_enable hdf5) - $(trilinos_enable hwloc) - $(trilinos_enable hypre) - $(trilinos_enable matio) - $(trilinos_enable metis) - $(trilinos_enable mkl) - $(trilinos_enable mkl PARDISO_MKL) - $(trilinos_enable mumps) - $(trilinos_enable netcdf Netcdf) - $(trilinos_enable petsc) - $(trilinos_enable qd) - $(trilinos_enable qt4 QT) - $(trilinos_enable scalapack) - $(trilinos_enable scalapack BLACS) - $(trilinos_enable scotch Scotch) - $(trilinos_enable sparse AMD) - $(trilinos_enable sparse CSparse) - $(trilinos_enable sparse UMFPACK) - $(trilinos_enable superlu SuperLU) - $(trilinos_enable taucs) - $(trilinos_enable tbb) - $(trilinos_enable threads Pthread) - $(trilinos_enable tvmet) - $(trilinos_enable yaml yaml-cpp) - $(trilinos_enable zlib Zlib) - ) - - use eigen && \ - mycmakeargs+=( - -DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3" - ) - use hypre && \ - mycmakeargs+=( - -DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre" - ) - use scotch && \ - mycmakeargs+=( - -DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch" - ) - - # cxsparse is a rewrite of csparse + extras - use sparse && \ - mycmakeargs+=( - -DCSparse_LIBRARY_NAMES="cxsparse" - ) - - # mandatory blas and lapack - trilinos_conf blas BLAS - trilinos_conf lapack LAPACK - use superlu && trilinos_conf superlu SuperLU - use metis && trilinos_conf metis METIS - - # blacs library is included in scalapack these days - if use scalapack; then - trilinos_conf scalapack SCALAPACK - mycmakeargs+=( - -DBLACS_LIBRARY_NAMES="scalapack" - -DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs" - ) - fi - - # TODO: do we need that line? - export CC=mpicc CXX=mpicxx && tc-export CC CXX - - # cmake-utils eclass patches the base directory CMakeLists.txt - # which does not work for complex Trilinos CMake modules - CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure - - # TODO: - # python bindings with python-r1 - # fix hypre bindings - # fix hdf5 - # cuda/thrust is untested - # do we always need mpi? and for all packages: blah[mpi] ? - # install docs, examples - # see what packages are related, do we need REQUIRED_USE - # proper use flags description - # add more use flags/packages ? -} - -src_install() { - cmake-utils_src_install - - # register $(get_libdir)/trilinos in LDPATH so that the dynamic linker - # has a chance to pick up the libraries... - cat >> "${T}"/99trilinos <<- EOF - LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos" - EOF - doenvd "${T}"/99trilinos -} diff --git a/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild b/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild deleted file mode 100644 index b43aabad7..000000000 --- a/sci-libs/trilinos/trilinos-12.10.1-r1.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils toolchain-funcs multilib toolchain-funcs - -DESCRIPTION="Scientific library collection for large scale problems" -HOMEPAGE="http://trilinos.sandia.gov/" -SRC_URI="http://trilinos.org/oldsite/download/files/${P}-Source.tar.gz" - -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" - -LICENSE="BSD LGPL-2.1" -SLOT="0" - -IUSE=" - adolc arprec boost clp cppunit cuda eigen glpk gtest hdf5 hwloc hypre - matio metis mkl mumps netcdf petsc qd qt4 scalapack scotch sparse - superlu taucs tbb test threads tvmet yaml zlib X -" - -# TODO: fix export cmake function for tests -RESTRICT="test" - -RDEPEND=" - sys-libs/binutils-libs - virtual/blas - virtual/lapack - virtual/mpi - adolc? ( sci-libs/adolc ) - arprec? ( sci-libs/arprec ) - boost? ( dev-libs/boost ) - clp? ( sci-libs/coinor-clp ) - cuda? ( >=dev-util/nvidia-cuda-toolkit-3.2 ) - eigen? ( dev-cpp/eigen:3 ) - gtest? ( dev-cpp/gtest ) - hdf5? ( sci-libs/hdf5[mpi] ) - hypre? ( sci-libs/hypre ) - hwloc? ( sys-apps/hwloc ) - matio? ( sci-libs/matio ) - mkl? ( sci-libs/mkl ) - metis? ( || ( sci-libs/parmetis sci-libs/metis ) ) - mumps? ( sci-libs/mumps ) - netcdf? ( sci-libs/netcdf ) - petsc? ( sci-mathematics/petsc ) - qd? ( sci-libs/qd ) - qt4? ( dev-qt/qtgui:4 ) - scalapack? ( virtual/scalapack ) - scotch? ( sci-libs/scotch ) - sparse? ( sci-libs/cxsparse sci-libs/umfpack ) - superlu? ( sci-libs/superlu ) - taucs? ( sci-libs/taucs ) - tbb? ( dev-cpp/tbb ) - tvmet? ( dev-libs/tvmet ) - yaml? ( dev-cpp/yaml-cpp ) - zlib? ( sys-libs/zlib ) - X? ( x11-libs/libX11 )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${P}-Source" - -trilinos_conf() { - local dirs libs d - for d in $($(tc-getPKG_CONFIG) --libs-only-L $1); do - dirs="${dirs};${d:2}" - done - [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_DIRS=${dirs:1}" ) - for d in $($(tc-getPKG_CONFIG) --libs-only-l $1); do - libs="${libs};${d:2}" - done - [[ -n ${libs} ]] && mycmakeargs+=( "-D${2}_LIBRARY_NAMES=${libs:1}" ) - dirs="" - for d in $($(tc-getPKG_CONFIG) --cflags-only-I $1); do - dirs="${dirs};${d:2}" - done - [[ -n ${dirs} ]] && mycmakeargs+=( "-D${2}_INCLUDE_DIRS=${dirs:1}" ) -} - -trilinos_enable() { - cmake-utils_use $1 TPL_ENABLE_${2:-${1^^}} -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-11.14.1-fix-install-paths.patch \ - "${FILESDIR}"/${P}-fix_install_paths_for_destdir.patch \ - "${FILESDIR}"/${P}-fix_install_paths_for_destdir-2.patch \ - "${FILESDIR}"/${P}-fix_gcc_7.patch - - epatch_user -} - -src_configure() { - - # temporarily disable pyTrilinos compilation - local mycmakeargs=( - -DBUILD_SHARED_LIBS=ON - -DCMAKE_INSTALL_PREFIX="${EPREFIX}" - -DTrilinos_ENABLE_ALL_PACKAGES=ON - -DZoltan2_ENABLE_Experimental=ON - -DTrilinos_ENABLE_SEACASExodus=$(usex netcdf) - -DTrilinos_ENABLE_SEACASExodiff=$(usex netcdf) - -DTrilinos_ENABLE_PyTrilinos=OFF - -DTrilinos_INSTALL_INCLUDE_DIR="${EPREFIX}/usr/include/trilinos" - -DTrilinos_INSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)/trilinos" - -DTrilinos_INSTALL_CONFIG_DIR="${EPREFIX}/usr/$(get_libdir)/cmake" - -DTPL_ENABLE_BinUtils=ON - -DTPL_ENABLE_MPI=ON - -DTPL_ENABLE_BLAS=ON - -DTPL_ENABLE_LAPACK=ON - $(cmake-utils_use test Trilinos_ENABLE_TESTS) - $(trilinos_enable adolc) - $(trilinos_enable arprec) - $(trilinos_enable boost Boost) - $(trilinos_enable boost BoostLib) - $(trilinos_enable cppunit Cppunit) - $(trilinos_enable clp Clp) - $(trilinos_enable cuda) - $(trilinos_enable cuda CUSPARSE) - $(trilinos_enable cuda Thrust) - $(trilinos_enable eigen Eigen) - $(trilinos_enable gtest gtest) - $(trilinos_enable glpk) - $(trilinos_enable hdf5) - $(trilinos_enable hwloc) - $(trilinos_enable hypre) - $(trilinos_enable matio Matio) - $(trilinos_enable metis) - $(trilinos_enable mkl) - $(trilinos_enable mkl PARDISO_MKL) - $(trilinos_enable mumps) - $(trilinos_enable netcdf Netcdf) - $(trilinos_enable petsc) - $(trilinos_enable qd) - $(trilinos_enable qt4 QT) - $(trilinos_enable scalapack) - $(trilinos_enable scalapack BLACS) - $(trilinos_enable scotch Scotch) - $(trilinos_enable sparse AMD) - $(trilinos_enable sparse CSparse) - $(trilinos_enable sparse UMFPACK) - $(trilinos_enable superlu SuperLU) - $(trilinos_enable taucs) - $(trilinos_enable tbb) - $(trilinos_enable threads Pthread) - $(trilinos_enable tvmet) - $(trilinos_enable yaml yaml-cpp) - $(trilinos_enable zlib Zlib) - $(trilinos_enable X X11) - ) - - use eigen && \ - mycmakeargs+=( - -DEigen_INCLUDE_DIRS="${EPREFIX}/usr/include/eigen3" - ) - use hypre && \ - mycmakeargs+=( - -DHYPRE_INCLUDE_DIRS="${EPREFIX}/usr/include/hypre" - ) - use scotch && \ - mycmakeargs+=( - -DScotch_INCLUDE_DIRS="${EPREFIX}/usr/include/scotch" - ) - - # cxsparse is a rewrite of csparse + extras - use sparse && \ - mycmakeargs+=( - -DCSparse_LIBRARY_NAMES="cxsparse" - ) - - # mandatory blas and lapack - trilinos_conf blas BLAS - trilinos_conf lapack LAPACK - use superlu && trilinos_conf superlu SuperLU - use metis && trilinos_conf metis METIS - - # blacs library is included in scalapack these days - if use scalapack; then - trilinos_conf scalapack SCALAPACK - mycmakeargs+=( - -DBLACS_LIBRARY_NAMES="scalapack" - -DBLACS_INCLUDE_DIRS="${EPREFIX}/usr/include/blacs" - ) - fi - - # TODO: do we need that line? - export CC=mpicc CXX=mpicxx && tc-export CC CXX - - # cmake-utils eclass patches the base directory CMakeLists.txt - # which does not work for complex Trilinos CMake modules - CMAKE_BUILD_TYPE=RELEASE cmake-utils_src_configure - - # TODO: - # python bindings with python-r1 - # fix hypre bindings - # fix hdf5 - # cuda/thrust is untested - # do we always need mpi? and for all packages: blah[mpi] ? - # install docs, examples - # see what packages are related, do we need REQUIRED_USE - # proper use flags description - # add more use flags/packages ? -} - -src_install() { - cmake-utils_src_install - - # Clean up the mess: - rm -r "${ED}"/TrilinosRepoVersion.txt "${ED}"/lib || die "rm failed" - mv "${ED}"/bin "${ED}/usr/$(get_libdir)"/trilinos || die "mv failed" - - # register $(get_libdir)/trilinos in LDPATH so that the dynamic linker - # has a chance to pick up the libraries... - cat >> "${T}"/99trilinos <<- EOF - LDPATH="${EPREFIX}/usr/$(get_libdir)/trilinos" - PATH="${EPREFIX}/usr/$(get_libdir)/trilinos/bin" - EOF - doenvd "${T}"/99trilinos -}