r36813 - in /packages/trilinos/trunk/debian: changelog patches/libname.patch patches/soname.patch patches/trilinosversion.patch
johannr-guest at users.alioth.debian.org
johannr-guest at users.alioth.debian.org
Fri Aug 13 14:43:01 UTC 2010
Author: johannr-guest
Date: Fri Aug 13 14:43:00 2010
New Revision: 36813
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36813
Log:
Update patches for Trilinos 10.4.0.
Modified:
packages/trilinos/trunk/debian/changelog
packages/trilinos/trunk/debian/patches/libname.patch
packages/trilinos/trunk/debian/patches/soname.patch
packages/trilinos/trunk/debian/patches/trilinosversion.patch
Modified: packages/trilinos/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/changelog?rev=36813&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/changelog (original)
+++ packages/trilinos/trunk/debian/changelog Fri Aug 13 14:43:00 2010
@@ -1,9 +1,12 @@
-trilinos (10.2.0.dfsg-1) unstable; urgency=low
+trilinos (10.4.0.dfsg-1) unstable; urgency=low
[Christophe Prud'homme]
* New upstream release
- -- Christophe Prud'homme <prudhomm at debian.org> Sun, 02 May 2010 11:30:09 +0200
+ [Johannes Ring]
+ * Update patches for 10.4.0 release.
+
+ -- Johannes Ring <johannr at simula.no> Fri, 13 Aug 2010 16:39:51 +0200
trilinos (10.0.4.dfsg-1) unstable; urgency=low
Modified: packages/trilinos/trunk/debian/patches/libname.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/libname.patch?rev=36813&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/libname.patch (original)
+++ packages/trilinos/trunk/debian/patches/libname.patch Fri Aug 13 14:43:00 2010
@@ -1,6 +1,6 @@
-diff -Nru trilinos-10.0.4-Source.orig/packages/amesos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/amesos/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/amesos/src/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/amesos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/amesos/src/CMakeLists.txt trilinos-10.4.0-Source/packages/amesos/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/amesos/src/CMakeLists.txt 2010-07-15 01:23:52.000000000 +0200
++++ trilinos-10.4.0-Source/packages/amesos/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -465,7 +465,7 @@
#
@@ -10,10 +10,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/anasazi/epetra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/anasazi/epetra/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/anasazi/epetra/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/anasazi/epetra/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -37,8 +37,8 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/anasazi/epetra/src/CMakeLists.txt trilinos-10.4.0-Source/packages/anasazi/epetra/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/anasazi/epetra/src/CMakeLists.txt 2010-07-15 01:23:55.000000000 +0200
++++ trilinos-10.4.0-Source/packages/anasazi/epetra/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -45,9 +45,9 @@
#
PACKAGE_ADD_LIBRARY(
@@ -23,11 +23,12 @@
SOURCES ${SOURCES}
- DEPLIBS anasazi
+ DEPLIBS trilinos_anasazi
- )
-diff -Nru trilinos-10.0.4-Source.orig/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt trilinos-10.0.4-Source/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -55,8 +55,8 @@
+ DEFINES -DANASAZIEPETRA_LIB_EXPORTS_MODE
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt trilinos-10.4.0-Source/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt 2010-07-15 01:23:55.000000000 +0200
++++ trilinos-10.4.0-Source/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -62,9 +62,9 @@
#
PACKAGE_ADD_LIBRARY(
@@ -37,11 +38,12 @@
SOURCES ${SOURCES}
- DEPLIBS anasazi
+ DEPLIBS trilinos_anasazi
- )
-diff -Nru trilinos-10.0.4-Source.orig/packages/anasazi/src/CMakeLists.txt trilinos-10.0.4-Source/packages/anasazi/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/anasazi/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/anasazi/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -136,7 +136,7 @@
+ DEFINES -DANASAZIEPETRA_MODELAPLACE_LIB_EXPORTS_MODE
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/anasazi/src/CMakeLists.txt trilinos-10.4.0-Source/packages/anasazi/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/anasazi/src/CMakeLists.txt 2010-07-15 01:23:55.000000000 +0200
++++ trilinos-10.4.0-Source/packages/anasazi/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -142,7 +142,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -49,10 +51,10 @@
+ trilinos_anasazi
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- )
-diff -Nru trilinos-10.0.4-Source.orig/packages/anasazi/thyra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/anasazi/thyra/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/anasazi/thyra/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/anasazi/thyra/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+ DEFINES -DANASAZI_LIB_EXPORTS_MODE
+diff -Nru trilinos-10.4.0-Source.orig/packages/anasazi/thyra/src/CMakeLists.txt trilinos-10.4.0-Source/packages/anasazi/thyra/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/anasazi/thyra/src/CMakeLists.txt 2010-07-15 01:23:56.000000000 +0200
++++ trilinos-10.4.0-Source/packages/anasazi/thyra/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -111,7 +111,7 @@
#
@@ -62,9 +64,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/aztecoo/src/CMakeLists.txt trilinos-10.0.4-Source/packages/aztecoo/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/aztecoo/src/CMakeLists.txt 2010-01-05 14:56:09.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/aztecoo/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/aztecoo/src/CMakeLists.txt trilinos-10.4.0-Source/packages/aztecoo/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/aztecoo/src/CMakeLists.txt 2010-07-15 01:23:57.000000000 +0200
++++ trilinos-10.4.0-Source/packages/aztecoo/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -173,7 +173,7 @@
#
@@ -74,9 +76,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/belos/epetra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/belos/epetra/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/belos/epetra/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/belos/epetra/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/belos/epetra/src/CMakeLists.txt trilinos-10.4.0-Source/packages/belos/epetra/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/belos/epetra/src/CMakeLists.txt 2010-07-15 01:23:58.000000000 +0200
++++ trilinos-10.4.0-Source/packages/belos/epetra/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -39,8 +39,8 @@
#
@@ -85,13 +87,13 @@
+ trilinos_belosepetra
HEADERS ${HEADERS}
SOURCES ${SOURCES}
-- DEPLIBS belos
-+ DEPLIBS trilinos_belos
- )
-diff -Nru trilinos-10.0.4-Source.orig/packages/belos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/belos/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/belos/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/belos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -108,7 +108,7 @@
+- DEPLIBS belos epetra
++ DEPLIBS trilinos_belos trilinos_epetra
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/belos/src/CMakeLists.txt trilinos-10.4.0-Source/packages/belos/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/belos/src/CMakeLists.txt 2010-07-15 01:23:58.000000000 +0200
++++ trilinos-10.4.0-Source/packages/belos/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -103,7 +103,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -100,10 +102,36 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/epetra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/epetra/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/epetra/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/epetra/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -219,7 +219,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/belos/tpetra/src/CMakeLists.txt trilinos-10.4.0-Source/packages/belos/tpetra/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/belos/tpetra/src/CMakeLists.txt 2010-07-15 01:23:59.000000000 +0200
++++ trilinos-10.4.0-Source/packages/belos/tpetra/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -37,8 +37,8 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- belostpetra
++ trilinos_belostpetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS belos tpetra kokkos
++ DEPLIBS trilinos_belos trilinos_tpetra trilinos_kokkos
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/CTrilinos/src/CMakeLists.txt trilinos-10.4.0-Source/packages/CTrilinos/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/CTrilinos/src/CMakeLists.txt 2010-07-15 01:24:00.000000000 +0200
++++ trilinos-10.4.0-Source/packages/CTrilinos/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -109,7 +109,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- ctrilinos
++ trilinos_ctrilinos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/epetra/src/CMakeLists.txt trilinos-10.4.0-Source/packages/epetra/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/epetra/src/CMakeLists.txt 2010-07-15 01:24:02.000000000 +0200
++++ trilinos-10.4.0-Source/packages/epetra/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -225,7 +225,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -111,11 +139,11 @@
+ trilinos_epetra
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- )
-diff -Nru trilinos-10.0.4-Source.orig/packages/epetraext/src/CMakeLists.txt trilinos-10.0.4-Source/packages/epetraext/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/epetraext/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/epetraext/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -425,7 +425,7 @@
+ DEFINES -DEPETRA_LIB_EXPORTS_MODE
+diff -Nru trilinos-10.4.0-Source.orig/packages/epetraext/src/CMakeLists.txt trilinos-10.4.0-Source/packages/epetraext/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/epetraext/src/CMakeLists.txt 2010-07-15 01:24:03.000000000 +0200
++++ trilinos-10.4.0-Source/packages/epetraext/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -432,7 +432,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -124,10 +152,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/fei/base/CMakeLists.txt trilinos-10.0.4-Source/packages/fei/base/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/fei/base/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/fei/base/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -233,7 +233,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/fei/base/CMakeLists.txt trilinos-10.4.0-Source/packages/fei/base/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/fei/base/CMakeLists.txt 2010-07-15 01:24:04.000000000 +0200
++++ trilinos-10.4.0-Source/packages/fei/base/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -241,7 +241,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -136,10 +164,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/fei/support-Trilinos/CMakeLists.txt trilinos-10.0.4-Source/packages/fei/support-Trilinos/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/fei/support-Trilinos/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/fei/support-Trilinos/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -71,7 +71,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/fei/support-Trilinos/CMakeLists.txt trilinos-10.4.0-Source/packages/fei/support-Trilinos/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/fei/support-Trilinos/CMakeLists.txt 2010-07-15 01:24:05.000000000 +0200
++++ trilinos-10.4.0-Source/packages/fei/support-Trilinos/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -75,7 +75,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -148,9 +176,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/fei/test_utils/CMakeLists.txt trilinos-10.0.4-Source/packages/fei/test_utils/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/fei/test_utils/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/fei/test_utils/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/fei/test_utils/CMakeLists.txt trilinos-10.4.0-Source/packages/fei/test_utils/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/fei/test_utils/CMakeLists.txt 2010-07-15 01:24:06.000000000 +0200
++++ trilinos-10.4.0-Source/packages/fei/test_utils/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -135,7 +135,7 @@
#
@@ -160,21 +188,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/fei/utest_cases/CMakeLists.txt trilinos-10.0.4-Source/packages/fei/utest_cases/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/fei/utest_cases/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/fei/utest_cases/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -73,7 +73,7 @@
- #
-
- PACKAGE_ADD_LIBRARY(
-- fei_utest_cases
-+ trilinos_fei_utest_cases
- HEADERS ${HEADERS}
- SOURCES ${SOURCES}
- )
-diff -Nru trilinos-10.0.4-Source.orig/packages/galeri/src/CMakeLists.txt trilinos-10.0.4-Source/packages/galeri/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/galeri/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/galeri/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/galeri/src/CMakeLists.txt trilinos-10.4.0-Source/packages/galeri/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/galeri/src/CMakeLists.txt 2010-07-15 01:24:07.000000000 +0200
++++ trilinos-10.4.0-Source/packages/galeri/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -146,7 +146,7 @@
#
@@ -184,10 +200,90 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/ifpack/src/CMakeLists.txt trilinos-10.0.4-Source/packages/ifpack/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/ifpack/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/ifpack/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -225,7 +225,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/globipack/src/CMakeLists.txt trilinos-10.4.0-Source/packages/globipack/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/globipack/src/CMakeLists.txt 2010-07-15 01:24:07.000000000 +0200
++++ trilinos-10.4.0-Source/packages/globipack/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -29,7 +29,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- globipack
++ trilinos_globipack
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/globipack/test/CMakeLists.txt trilinos-10.4.0-Source/packages/globipack/test/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/globipack/test/CMakeLists.txt 2010-07-15 01:24:07.000000000 +0200
++++ trilinos-10.4.0-Source/packages/globipack/test/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -22,7 +22,7 @@
+ SOURCES
+ ArmijoPolyInterpLineSearch_UnitTests.cpp
+ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+- DEPLIBS globipack_test_meritfuncs
++ DEPLIBS trilinos_globipack_test_meritfuncs
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -33,7 +33,7 @@
+ SOURCES
+ GoldenQuadInterpBracket_UnitTests.cpp
+ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+- DEPLIBS globipack_test_meritfuncs
++ DEPLIBS trilinos_globipack_test_meritfuncs
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -44,7 +44,7 @@
+ SOURCES
+ Brents1DMinimization_UnitTests.cpp
+ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+- DEPLIBS globipack_test_meritfuncs
++ DEPLIBS trilinos_globipack_test_meritfuncs
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -55,7 +55,7 @@
+ SOURCES
+ BrentsLineSearch_UnitTests.cpp
+ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+- DEPLIBS globipack_test_meritfuncs
++ DEPLIBS trilinos_globipack_test_meritfuncs
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/globipack/test/meritfuncs/CMakeLists.txt trilinos-10.4.0-Source/packages/globipack/test/meritfuncs/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/globipack/test/meritfuncs/CMakeLists.txt 2010-07-15 01:24:07.000000000 +0200
++++ trilinos-10.4.0-Source/packages/globipack/test/meritfuncs/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -14,11 +14,11 @@
+ APPEND_GLOB(HEADERS ${DIR}/*.hpp)
+
+ PACKAGE_ADD_LIBRARY(
+- globipack_test_meritfuncs
++ trilinos_globipack_test_meritfuncs
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ TESTONLY
+- DEPLIBS globipack
++ DEPLIBS trilinos_globipack
+ )
+
+ ADD_SUBDIRECTORY(UnitTests)
+diff -Nru trilinos-10.4.0-Source.orig/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt trilinos-10.4.0-Source/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt 2010-07-15 01:24:07.000000000 +0200
++++ trilinos-10.4.0-Source/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -6,7 +6,7 @@
+ SOURCES
+ TestLagrPolyMeritFunc1D_UnitTests.cpp
+ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+- DEPLIBS globipack_test_meritfuncs
++ DEPLIBS trilinos_globipack_test_meritfuncs
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+diff -Nru trilinos-10.4.0-Source.orig/packages/ifpack/src/CMakeLists.txt trilinos-10.4.0-Source/packages/ifpack/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/ifpack/src/CMakeLists.txt 2010-07-15 01:24:07.000000000 +0200
++++ trilinos-10.4.0-Source/packages/ifpack/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -232,7 +232,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -196,9 +292,21 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/intrepid/example/Drivers/CMakeLists.txt trilinos-10.0.4-Source/packages/intrepid/example/Drivers/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/intrepid/example/Drivers/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/intrepid/example/Drivers/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/ifpack/test/AztecOO/CMakeLists.txt trilinos-10.4.0-Source/packages/ifpack/test/AztecOO/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/ifpack/test/AztecOO/CMakeLists.txt 2010-07-15 01:24:08.000000000 +0200
++++ trilinos-10.4.0-Source/packages/ifpack/test/AztecOO/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -17,7 +17,7 @@
+ PACKAGE_ADD_EXECUTABLE(
+ ifp_aztecoo
+ SOURCES aztecoo_solve.cpp build_problem.cpp build_solver.cpp read_matrix.cpp
+- DEPLIBS aztecoo epetra teuchos
++ DEPLIBS trilinos_aztecoo trilinos_epetra trilinos_teuchos
+ )
+
+ PACKAGE_COPY_FILES_TO_BINARY_DIR(IfpackAztecOOCopyFiles
+diff -Nru trilinos-10.4.0-Source.orig/packages/intrepid/example/Drivers/CMakeLists.txt trilinos-10.4.0-Source/packages/intrepid/example/Drivers/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/intrepid/example/Drivers/CMakeLists.txt 2010-07-15 01:24:08.000000000 +0200
++++ trilinos-10.4.0-Source/packages/intrepid/example/Drivers/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -4,7 +4,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_01
@@ -226,10 +334,28 @@
ARGS "10 10 10"
NUM_MPI_PROCS 1
# PASS_REGULAR_EXPRESSION "TEST PASSED"
-diff -Nru trilinos-10.0.4-Source.orig/packages/intrepid/src/CMakeLists.txt trilinos-10.0.4-Source/packages/intrepid/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/intrepid/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/intrepid/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -181,7 +181,7 @@
+@@ -31,7 +31,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_04
+ SOURCES example_04.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "1 1"
+ NUM_MPI_PROCS 1
+ # PASS_REGULAR_EXPRESSION "TEST PASSED"
+@@ -40,7 +40,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_05
+ SOURCES example_05.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "1 10 10"
+ NUM_MPI_PROCS 1
+ # PASS_REGULAR_EXPRESSION "TEST PASSED"
+diff -Nru trilinos-10.4.0-Source.orig/packages/intrepid/src/CMakeLists.txt trilinos-10.4.0-Source/packages/intrepid/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/intrepid/src/CMakeLists.txt 2010-07-15 01:24:08.000000000 +0200
++++ trilinos-10.4.0-Source/packages/intrepid/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -199,7 +199,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -238,9 +364,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/example/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/example/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/isorropia/example/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/isorropia/example/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/isorropia/example/CMakeLists.txt trilinos-10.4.0-Source/packages/isorropia/example/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/isorropia/example/CMakeLists.txt 2010-07-15 01:24:10.000000000 +0200
++++ trilinos-10.4.0-Source/packages/isorropia/example/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -8,6 +8,6 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
matrix_1
@@ -249,9 +375,9 @@
+ DEPLIBS trilinos_isorropia_test_utils
COMM serial mpi
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/example/geometric/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/example/geometric/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/isorropia/example/geometric/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/isorropia/example/geometric/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/isorropia/example/geometric/CMakeLists.txt trilinos-10.4.0-Source/packages/isorropia/example/geometric/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/isorropia/example/geometric/CMakeLists.txt 2010-07-15 01:24:10.000000000 +0200
++++ trilinos-10.4.0-Source/packages/isorropia/example/geometric/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
example_rcb
@@ -261,9 +387,9 @@
COMM serial mpi
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/example/levelSchedule/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/example/levelSchedule/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/isorropia/example/levelSchedule/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/isorropia/example/levelSchedule/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/isorropia/example/levelSchedule/CMakeLists.txt trilinos-10.4.0-Source/packages/isorropia/example/levelSchedule/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/isorropia/example/levelSchedule/CMakeLists.txt 2010-07-15 01:24:10.000000000 +0200
++++ trilinos-10.4.0-Source/packages/isorropia/example/levelSchedule/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
levelSchedule
@@ -273,10 +399,10 @@
COMM serial
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/src/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/isorropia/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/isorropia/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -102,7 +102,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/isorropia/src/CMakeLists.txt trilinos-10.4.0-Source/packages/isorropia/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/isorropia/src/CMakeLists.txt 2010-07-15 01:24:10.000000000 +0200
++++ trilinos-10.4.0-Source/packages/isorropia/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -173,7 +173,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -285,9 +411,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/test/geometric/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/test/geometric/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/isorropia/test/geometric/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/isorropia/test/geometric/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/isorropia/test/geometric/CMakeLists.txt trilinos-10.4.0-Source/packages/isorropia/test/geometric/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/isorropia/test/geometric/CMakeLists.txt 2010-07-15 01:24:10.000000000 +0200
++++ trilinos-10.4.0-Source/packages/isorropia/test/geometric/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_geometric
@@ -297,9 +423,21 @@
COMM serial mpi
ARGS
"--f=brack_3D.coords"
-diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/test/mtx/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/test/mtx/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/isorropia/test/mtx/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/isorropia/test/mtx/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/isorropia/test/levelsolver/CMakeLists.txt trilinos-10.4.0-Source/packages/isorropia/test/levelsolver/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/isorropia/test/levelsolver/CMakeLists.txt 2010-07-15 01:24:10.000000000 +0200
++++ trilinos-10.4.0-Source/packages/isorropia/test/levelsolver/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -7,7 +7,7 @@
+ COMM serial mpi
+ ARGS
+ "M01.mtx 4 10"
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi tpetra
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi trilinos_tpetra
+ )
+
+ PACKAGE_COPY_FILES_TO_BINARY_DIR(TestLevelSolverCopyFiles
+diff -Nru trilinos-10.4.0-Source.orig/packages/isorropia/test/mtx/CMakeLists.txt trilinos-10.4.0-Source/packages/isorropia/test/mtx/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/isorropia/test/mtx/CMakeLists.txt 2010-07-15 01:24:10.000000000 +0200
++++ trilinos-10.4.0-Source/packages/isorropia/test/mtx/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_balanced_copy
@@ -318,7 +456,7 @@
COMM serial mpi
ARGS
"--f=simple.mtx"
-@@ -31,7 +31,7 @@
+@@ -47,7 +47,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_colorer
SOURCES test_colorer.cpp
@@ -327,9 +465,9 @@
COMM serial mpi
ARGS
"--f=simple.mtx"
-diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/test/part_sizes/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/test/part_sizes/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/isorropia/test/part_sizes/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/isorropia/test/part_sizes/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/isorropia/test/part_sizes/CMakeLists.txt trilinos-10.4.0-Source/packages/isorropia/test/part_sizes/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/isorropia/test/part_sizes/CMakeLists.txt 2010-07-15 01:24:10.000000000 +0200
++++ trilinos-10.4.0-Source/packages/isorropia/test/part_sizes/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
part_sizes
@@ -339,9 +477,9 @@
COMM serial mpi
ARGS
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/test/probing/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/test/probing/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/isorropia/test/probing/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/isorropia/test/probing/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/isorropia/test/probing/CMakeLists.txt trilinos-10.4.0-Source/packages/isorropia/test/probing/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/isorropia/test/probing/CMakeLists.txt 2010-07-15 01:24:10.000000000 +0200
++++ trilinos-10.4.0-Source/packages/isorropia/test/probing/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -5,7 +5,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_probing
@@ -351,9 +489,9 @@
COMM serial mpi
ARGS
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/isorropia/utils/CMakeLists.txt trilinos-10.0.4-Source/packages/isorropia/utils/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/isorropia/utils/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/isorropia/utils/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/isorropia/utils/CMakeLists.txt trilinos-10.4.0-Source/packages/isorropia/utils/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/isorropia/utils/CMakeLists.txt 2010-07-15 01:24:11.000000000 +0200
++++ trilinos-10.4.0-Source/packages/isorropia/utils/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -33,9 +33,9 @@
#
@@ -366,10 +504,19 @@
- DEPLIBS isorropia
+ DEPLIBS trilinos_isorropia
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/kokkos/LinAlg/CMakeLists.txt trilinos-10.0.4-Source/packages/kokkos/LinAlg/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/kokkos/LinAlg/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/kokkos/LinAlg/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -53,10 +53,10 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/kokkos/LinAlg/CMakeLists.txt trilinos-10.4.0-Source/packages/kokkos/LinAlg/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/kokkos/LinAlg/CMakeLists.txt 2010-07-15 01:24:11.000000000 +0200
++++ trilinos-10.4.0-Source/packages/kokkos/LinAlg/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -64,7 +64,7 @@
+ IF (Kokkos_ENABLE_Thrust)
+ # this pulls in Thrust, CUSP, and Kokkos/NodeAPI
+ include_directories(${Kokkos_INCLUDE_DIRS})
+- CUDA_ADD_LIBRARY(kokkoslinalg_cuda Kokkos_DefaultArithmetic.cu Kokkos_DefaultBlockSparseMultiply.cu Kokkos_DefaultSparseOps.cu Kokkos_DefaultRelaxation.cu)
++ CUDA_ADD_LIBRARY(trilinos_kokkoslinalg_cuda Kokkos_DefaultArithmetic.cu Kokkos_DefaultBlockSparseMultiply.cu Kokkos_DefaultSparseOps.cu Kokkos_DefaultRelaxation.cu)
+ APPEND_SET(KOKKOS_LINALG_CUDALIBS "kokkoslinalg_cuda")
+ ENDIF()
+
+@@ -73,10 +73,10 @@
#
PACKAGE_ADD_LIBRARY(
@@ -377,14 +524,14 @@
+ trilinos_kokkoslinalg
HEADERS ${HEADERS}
SOURCES ${SOURCES}
-- DEPLIBS kokkos kokkosnodeapi
-+ DEPLIBS trilinos_kokkos trilinos_kokkosnodeapi
+- DEPLIBS kokkos kokkosnodeapi ${KOKKOS_LINALG_CUDALIBS}
++ DEPLIBS trilinos_kokkos trilinos_kokkosnodeapi ${KOKKOS_LINALG_CUDALIBS}
)
PACKAGE_ADD_TEST_DIRECTORIES(test)
-diff -Nru trilinos-10.0.4-Source.orig/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt trilinos-10.0.4-Source/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt trilinos-10.4.0-Source/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt 2010-07-15 01:24:11.000000000 +0200
++++ trilinos-10.4.0-Source/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -6,7 +6,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -401,9 +548,9 @@
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt trilinos-10.0.4-Source/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt trilinos-10.4.0-Source/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt 2010-07-15 01:24:11.000000000 +0200
++++ trilinos-10.4.0-Source/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -6,7 +6,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -420,10 +567,30 @@
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/kokkos/NodeAPI/CMakeLists.txt trilinos-10.0.4-Source/packages/kokkos/NodeAPI/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/kokkos/NodeAPI/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/kokkos/NodeAPI/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -73,10 +73,10 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt trilinos-10.4.0-Source/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt 2010-07-15 01:24:11.000000000 +0200
++++ trilinos-10.4.0-Source/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -6,5 +6,5 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt trilinos-10.4.0-Source/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt 2010-07-15 01:24:11.000000000 +0200
++++ trilinos-10.4.0-Source/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -8,5 +8,5 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/kokkos/NodeAPI/CMakeLists.txt trilinos-10.4.0-Source/packages/kokkos/NodeAPI/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/kokkos/NodeAPI/CMakeLists.txt 2010-07-15 01:24:11.000000000 +0200
++++ trilinos-10.4.0-Source/packages/kokkos/NodeAPI/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -101,10 +101,10 @@
#
PACKAGE_ADD_LIBRARY(
@@ -436,10 +603,10 @@
)
PACKAGE_ADD_TEST_DIRECTORIES(test)
-diff -Nru trilinos-10.0.4-Source.orig/packages/kokkos/NodeAPI/test/CMakeLists.txt trilinos-10.0.4-Source/packages/kokkos/NodeAPI/test/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/kokkos/NodeAPI/test/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/kokkos/NodeAPI/test/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -8,7 +8,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/kokkos/NodeAPI/test/CMakeLists.txt trilinos-10.4.0-Source/packages/kokkos/NodeAPI/test/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/kokkos/NodeAPI/test/CMakeLists.txt 2010-07-15 01:24:11.000000000 +0200
++++ trilinos-10.4.0-Source/packages/kokkos/NodeAPI/test/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -15,7 +15,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
@@ -448,16 +615,16 @@
)
PACKAGE_ADD_EXECUTABLE_AND_TEST(
-@@ -19,5 +19,5 @@
+@@ -28,5 +28,5 @@
COMM serial mpi
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
- DEPLIBS kokkosnodeapi
+ DEPLIBS trilinos_kokkosnodeapi
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/kokkos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/kokkos/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/kokkos/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/kokkos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/kokkos/src/CMakeLists.txt trilinos-10.4.0-Source/packages/kokkos/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/kokkos/src/CMakeLists.txt 2010-07-15 01:24:11.000000000 +0200
++++ trilinos-10.4.0-Source/packages/kokkos/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -44,7 +44,7 @@
#
@@ -467,9 +634,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/komplex/src/CMakeLists.txt trilinos-10.0.4-Source/packages/komplex/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/komplex/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/komplex/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/komplex/src/CMakeLists.txt trilinos-10.4.0-Source/packages/komplex/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/komplex/src/CMakeLists.txt 2010-07-15 01:24:12.000000000 +0200
++++ trilinos-10.4.0-Source/packages/komplex/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -69,7 +69,7 @@
#
@@ -479,9 +646,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/meros/src/CMakeLists.txt trilinos-10.0.4-Source/packages/meros/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/meros/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/meros/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/meros/src/CMakeLists.txt trilinos-10.4.0-Source/packages/meros/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/meros/src/CMakeLists.txt 2010-07-15 01:24:12.000000000 +0200
++++ trilinos-10.4.0-Source/packages/meros/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -84,7 +84,7 @@
#
@@ -491,10 +658,108 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/ml/src/CMakeLists.txt trilinos-10.0.4-Source/packages/ml/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/ml/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/ml/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -306,7 +306,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/meros/thyra/src/CMakeLists.txt trilinos-10.4.0-Source/packages/meros/thyra/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/meros/thyra/src/CMakeLists.txt 2010-07-15 01:24:12.000000000 +0200
++++ trilinos-10.4.0-Source/packages/meros/thyra/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -9,7 +9,7 @@
+ APPEND_GLOB(SOURCES ${DIR}/*.cpp)
+
+ PACKAGE_ADD_LIBRARY(
+- merosthyra
++ trilinos_merosthyra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/mesquite/itaps/CMakeLists.txt trilinos-10.4.0-Source/packages/mesquite/itaps/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/mesquite/itaps/CMakeLists.txt 2010-07-15 01:24:13.000000000 +0200
++++ trilinos-10.4.0-Source/packages/mesquite/itaps/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -9,7 +9,7 @@
+ SET(${PACKAGE_NAME}_ENABLE_IMESH ON)
+ MAKEFILE_VAL(${IMESH_DEFS} IMESH_LIBS IMESH_LIBS)
+ MAKEFILE_VAL(${IMESH_DEFS} IMESH_INCLUDES IMESH_INCL)
+- PACKAGE_ADD_LIBRARY(msqimesh HEADERS MsqIMesh.hpp SOURCES MsqIMesh.cpp)
++ PACKAGE_ADD_LIBRARY(trilinos_msqimesh HEADERS MsqIMesh.hpp SOURCES MsqIMesh.cpp)
+ SET_SOURCE_FILES_PROPERTIES( MsqIMesh.cpp COMPILE_FLAGS ${MESQUITE_LIB_DEFINES} )
+ ELSE(IMESH_DEFS)
+ SET(${PACKAGE_NAME}_ENABLE_IMESH OFF)
+@@ -18,14 +18,14 @@
+ IF(IGEOM_DEFS)
+ MAKEFILE_VAL(${IGEOM_DEFS} IGEOM_LIBS IGEOM_LIBS)
+ MAKEFILE_VAL(${IGEOM_DEFS} IGEOM_INCLUDES IGEOM_INCL)
+- PACKAGE_ADD_LIBRARY(msqigeom HEADERS MsqIGeom.hpp SOURCES MsqIGeom.cpp)
++ PACKAGE_ADD_LIBRARY(trilinos_msqigeom HEADERS MsqIGeom.hpp SOURCES MsqIGeom.cpp)
+ SET_SOURCE_FILES_PROPERTIES( MsqIGeom.cpp COMPILE_FLAGS ${MESQUITE_LIB_DEFINES} )
+ ENDIF(IGEOM_DEFS)
+
+ IF(IREL_DEFS)
+ MAKEFILE_VAL(${IREL_DEFS} IREL_LIBS IREL_LIBS)
+ MAKEFILE_VAL(${IREL_DEFS} IREL_INCLUDES IREL_INCL)
+- PACKAGE_ADD_LIBRARY(msqirel HEADERS MsqIRel.hpp SOURCES MsqIRel.cpp)
++ PACKAGE_ADD_LIBRARY(trilinos_msqirel HEADERS MsqIRel.hpp SOURCES MsqIRel.cpp)
+ SET_SOURCE_FILES_PROPERTIES( MsqIRel.cpp COMPILE_FLAGS ${MESQUITE_LIB_DEFINES} )
+ ENDIF(IREL_DEFS)
+
+@@ -33,7 +33,7 @@
+ IF(IMESHP_DEFS)
+ MAKEFILE_VAL(${IMESHP_DEFS} IMESHP_LIBS IMESHP_LIBS)
+ MAKEFILE_VAL(${IMESHP_DEFS} IMESHP_INCLUDES IMESHP_INCL)
+- PACKAGE_ADD_LIBRARY(msqimeshp HEADERS MsqIMeshP.hpp SOURCES MsqIMeshP.cpp)
++ PACKAGE_ADD_LIBRARY(trilinos_msqimeshp HEADERS MsqIMeshP.hpp SOURCES MsqIMeshP.cpp)
+ SET_SOURCE_FILES_PROPERTIES( MsqIMeshP.cpp COMPILE_FLAGS ${MESQUITE_LIB_DEFINES} )
+ ENDIF(IMESHP_DEFS)
+ ENDIF()
+diff -Nru trilinos-10.4.0-Source.orig/packages/mesquite/src/CMakeLists.txt trilinos-10.4.0-Source/packages/mesquite/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/mesquite/src/CMakeLists.txt 2010-07-15 01:24:15.000000000 +0200
++++ trilinos-10.4.0-Source/packages/mesquite/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -936,7 +936,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- mesquite
++ trilinos_mesquite
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/mesquite/utils/CMakeLists.txt trilinos-10.4.0-Source/packages/mesquite/utils/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/mesquite/utils/CMakeLists.txt 2010-07-15 01:24:17.000000000 +0200
++++ trilinos-10.4.0-Source/packages/mesquite/utils/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -35,7 +35,7 @@
+ IF (NOT ${PROJECT_NAME} STREQUAL "Mesquite")
+
+ PACKAGE_ADD_LIBRARY(
+- msqutil
++ trilinos_msqutil
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+@@ -74,7 +74,7 @@
+
+ ELSE()
+
+- ADD_LIBRARY( msqutil STATIC ${SOURCES} ${HEADERS} )
++ ADD_LIBRARY( trilinos_msqutil STATIC ${SOURCES} ${HEADERS} )
+ ADD_EXECUTABLE( vtkrandom randomize.cpp domain.cpp )
+ ADD_EXECUTABLE( msqshape shape-improve.cpp domain.cpp )
+ ADD_EXECUTABLE( vtkxform transform.cpp )
+@@ -82,10 +82,10 @@
+
+ ENDIF()
+
+-TARGET_LINK_LIBRARIES( vtkrandom mesquite msqutil )
+-TARGET_LINK_LIBRARIES( msqshape mesquite msqutil )
+-TARGET_LINK_LIBRARIES( vtkxform mesquite msqutil )
+-TARGET_LINK_LIBRARIES( msqquality mesquite msqutil )
++TARGET_LINK_LIBRARIES( vtkrandom trilinos_mesquite trilinos_msqutil )
++TARGET_LINK_LIBRARIES( msqshape trilinos_mesquite trilinos_msqutil )
++TARGET_LINK_LIBRARIES( vtkxform trilinos_mesquite trilinos_msqutil )
++TARGET_LINK_LIBRARIES( msqquality trilinos_mesquite trilinos_msqutil )
+
+ IF(${PACKAGE_NAME}_ENABLE_SHARED)
+ SET( MESQUITE_UTIL_DEFINES "${MESQUITE_DEFINES}" )
+diff -Nru trilinos-10.4.0-Source.orig/packages/ml/src/CMakeLists.txt trilinos-10.4.0-Source/packages/ml/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/ml/src/CMakeLists.txt 2010-07-15 01:24:18.000000000 +0200
++++ trilinos-10.4.0-Source/packages/ml/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -305,7 +305,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -503,9 +768,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/moertel/src/CMakeLists.txt trilinos-10.0.4-Source/packages/moertel/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/moertel/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/moertel/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/moertel/src/CMakeLists.txt trilinos-10.4.0-Source/packages/moertel/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/moertel/src/CMakeLists.txt 2010-07-15 01:24:19.000000000 +0200
++++ trilinos-10.4.0-Source/packages/moertel/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -95,7 +95,7 @@
#
@@ -515,9 +780,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/moocho/src/CMakeLists.txt trilinos-10.0.4-Source/packages/moocho/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/moocho/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/moocho/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/moocho/src/CMakeLists.txt trilinos-10.4.0-Source/packages/moocho/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/moocho/src/CMakeLists.txt 2010-07-15 01:24:21.000000000 +0200
++++ trilinos-10.4.0-Source/packages/moocho/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -198,7 +198,7 @@
#
@@ -527,9 +792,21 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/moocho/thyra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/moocho/thyra/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/moocho/thyra/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/moocho/thyra/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt trilinos-10.4.0-Source/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt 2010-07-15 01:24:24.000000000 +0200
++++ trilinos-10.4.0-Source/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -60,7 +60,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST( ThyraDiagonalQuadraticResponseOnlyOpt
+ SOURCES
+ ThyraDiagonalQuadraticResponseOnlyOptMain.cpp
+- DEPLIBS thyra_nonlinear_test_models
++ DEPLIBS trilinos_thyra_nonlinear_test_models
+ NUM_MPI_PROCS 1
+ )
+
+diff -Nru trilinos-10.4.0-Source.orig/packages/moocho/thyra/src/CMakeLists.txt trilinos-10.4.0-Source/packages/moocho/thyra/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/moocho/thyra/src/CMakeLists.txt 2010-07-15 01:24:24.000000000 +0200
++++ trilinos-10.4.0-Source/packages/moocho/thyra/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -21,8 +21,8 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
@@ -541,9 +818,9 @@
- DEPLIBS moocho
+ DEPLIBS trilinos_moocho
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/src/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/src/CMakeLists.txt 2010-07-15 01:24:25.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -210,7 +210,7 @@
#
@@ -553,9 +830,9 @@
HEADERS ${HEADERS}
NOINSTALLHEADERS ${NOINSTALLHEADERS}
SOURCES ${SOURCES}
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-belos/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-belos/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/src-belos/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/src-belos/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/src-belos/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/src-belos/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/src-belos/CMakeLists.txt 2010-07-15 01:24:25.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/src-belos/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -23,7 +23,7 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_BELOS)
@@ -565,10 +842,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-epetra/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-epetra/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/src-epetra/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/src-epetra/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -75,9 +75,9 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/src-epetra/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/src-epetra/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/src-epetra/CMakeLists.txt 2010-07-15 01:24:25.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/src-epetra/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -62,9 +62,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA)
PACKAGE_ADD_LIBRARY(
@@ -580,9 +857,9 @@
+ DEPLIBS trilinos_nox
)
ENDIF()
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-lapack/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-lapack/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/src-lapack/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/src-lapack/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/src-lapack/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/src-lapack/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/src-lapack/CMakeLists.txt 2010-07-15 01:24:26.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/src-lapack/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -22,9 +22,9 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK)
@@ -595,10 +872,10 @@
+ DEPLIBS trilinos_nox
)
ENDIF()
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-loca/src/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-loca/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/src-loca/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/src-loca/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -338,10 +338,10 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/src-loca/src/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/src-loca/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/src-loca/src/CMakeLists.txt 2010-07-15 01:24:26.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/src-loca/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -351,10 +351,10 @@
IF (NOX_ENABLE_LOCA)
PACKAGE_ADD_LIBRARY(
@@ -611,10 +888,10 @@
+ DEPLIBS trilinos_nox
)
ENDIF()
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-epetra/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-loca/src-epetra/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-epetra/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/src-loca/src-epetra/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -80,9 +80,9 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/src-loca/src-epetra/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/src-loca/src-epetra/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/src-loca/src-epetra/CMakeLists.txt 2010-07-15 01:24:27.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/src-loca/src-epetra/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -81,9 +81,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
PACKAGE_ADD_LIBRARY(
@@ -626,9 +903,9 @@
+ DEPLIBS trilinos_loca trilinos_noxepetra trilinos_nox
)
ENDIF()
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-lapack/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-loca/src-lapack/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-lapack/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/src-loca/src-lapack/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/src-loca/src-lapack/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/src-loca/src-lapack/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/src-loca/src-lapack/CMakeLists.txt 2010-07-15 01:24:27.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/src-loca/src-lapack/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -24,9 +24,9 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA)
@@ -641,9 +918,9 @@
+ DEPLIBS trilinos_loca trilinos_noxlapack trilinos_nox
)
ENDIF()
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-mf/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-loca/src-mf/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-mf/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/src-loca/src-mf/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/src-loca/src-mf/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/src-loca/src-mf/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/src-loca/src-mf/CMakeLists.txt 2010-07-15 01:24:27.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/src-loca/src-mf/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -22,7 +22,7 @@
IF (NOX_ENABLE_LOCA AND NOX_ENABLE_MF)
@@ -653,9 +930,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-thyra/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-loca/src-thyra/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/src-loca/src-thyra/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/src-loca/src-thyra/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/src-loca/src-thyra/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/src-loca/src-thyra/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/src-loca/src-thyra/CMakeLists.txt 2010-07-15 01:24:27.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/src-loca/src-thyra/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -19,9 +19,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA AND NOX_ENABLE_LOCA)
@@ -668,9 +945,9 @@
+ DEPLIBS trilinos_loca trilinos_noxthyra trilinos_nox
)
ENDIF()
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-petsc/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-petsc/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/src-petsc/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/src-petsc/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/src-petsc/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/src-petsc/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/src-petsc/CMakeLists.txt 2010-07-15 01:24:27.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/src-petsc/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -25,9 +25,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_PETSC)
@@ -685,9 +962,9 @@
-ENDIF()
\ No newline at end of file
+ENDIF()
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/src-thyra/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/src-thyra/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/src-thyra/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/src-thyra/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/src-thyra/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/src-thyra/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/src-thyra/CMakeLists.txt 2010-07-15 01:24:27.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/src-thyra/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -24,9 +24,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA)
@@ -702,9 +979,9 @@
-ENDIF()
\ No newline at end of file
+ENDIF()
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt 2010-07-15 01:24:27.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -16,7 +16,7 @@
Problem_Interface.C
brussCont.C
@@ -723,9 +1000,9 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt 2010-07-15 01:24:27.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -17,7 +17,7 @@
brussXYZT_ifpack.C
COMM serial mpi
@@ -807,21 +1084,9 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_EpetraExt_ModelEvaluator/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_EpetraExt_ModelEvaluator/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_EpetraExt_ModelEvaluator/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_EpetraExt_ModelEvaluator/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -12,7 +12,7 @@
- tcubed.C
- COMM serial mpi
- NUM_MPI_PROCS 2
-- DEPLIBS noxtestutils locaepetratestproblems
-+ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
- ARGS -v
- PASS_REGULAR_EXPRESSION "All tests passed"
- )
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt 2010-07-15 01:24:27.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -13,7 +13,7 @@
multipointTcubed.C
COMM mpi
@@ -831,9 +1096,9 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt 2010-07-15 01:24:27.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -11,7 +11,7 @@
Pitchfork.C
COMM serial mpi
@@ -843,9 +1108,9 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt 2010-07-15 01:24:27.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -11,7 +11,7 @@
Tcubed.C
COMM serial mpi
@@ -873,10 +1138,10 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -28,7 +28,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt 2010-07-15 01:24:27.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -28,11 +28,11 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
PACKAGE_ADD_LIBRARY(
@@ -885,11 +1150,16 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
TESTONLY
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Thyra_ModelEvaluator/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Thyra_ModelEvaluator/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_Thyra_ModelEvaluator/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_Thyra_ModelEvaluator/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -12,7 +12,7 @@
- tcubed.C
+- DEPLIBS loca locaepetra
++ DEPLIBS trilinos_loca trilinos_locaepetra
+ )
+
+ ENDIF()
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt 2010-07-15 01:24:27.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -11,7 +11,7 @@
+ HouseholderBorderedSolve.C
COMM serial mpi
NUM_MPI_PROCS 2
- DEPLIBS noxtestutils locaepetratestproblems
@@ -897,8 +1167,8 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -23,7 +23,7 @@
- tcubedTP.C
+@@ -22,7 +22,7 @@
+ HouseholderTransposeBorderedSolve.C
COMM serial mpi
NUM_MPI_PROCS 2
- DEPLIBS noxtestutils locaepetratestproblems
@@ -906,11 +1176,8 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -11,7 +11,7 @@
- HouseholderBorderedSolve.C
+@@ -33,7 +33,7 @@
+ TransposeSolve.C
COMM serial mpi
NUM_MPI_PROCS 2
- DEPLIBS noxtestutils locaepetratestproblems
@@ -918,8 +1185,8 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -22,7 +22,7 @@
- HouseholderTransposeBorderedSolve.C
+@@ -44,7 +44,7 @@
+ CompositeConstraint.C
COMM serial mpi
NUM_MPI_PROCS 2
- DEPLIBS noxtestutils locaepetratestproblems
@@ -927,8 +1194,8 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -33,7 +33,7 @@
- TransposeSolve.C
+@@ -55,7 +55,7 @@
+ CompositeConstraintMVDX.C
COMM serial mpi
NUM_MPI_PROCS 2
- DEPLIBS noxtestutils locaepetratestproblems
@@ -936,8 +1203,8 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -44,7 +44,7 @@
- CompositeConstraint.C
+@@ -66,7 +66,7 @@
+ NaturalContResidualFills.C
COMM serial mpi
NUM_MPI_PROCS 2
- DEPLIBS noxtestutils locaepetratestproblems
@@ -945,27 +1212,9 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -55,7 +55,7 @@
- CompositeConstraintMVDX.C
- COMM serial mpi
- NUM_MPI_PROCS 2
-- DEPLIBS noxtestutils locaepetratestproblems
-+ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
- ARGS -v
- PASS_REGULAR_EXPRESSION "All tests passed"
- )
-@@ -66,7 +66,7 @@
- NaturalContResidualFills.C
- COMM serial mpi
- NUM_MPI_PROCS 2
-- DEPLIBS noxtestutils locaepetratestproblems
-+ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
- ARGS -v
- PASS_REGULAR_EXPRESSION "All tests passed"
- )
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt 2010-07-15 01:24:28.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -13,7 +13,7 @@
test.C
Laplace2D.C
@@ -984,9 +1233,9 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt 2010-07-15 01:24:28.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Epetra_Vector
@@ -1005,9 +1254,9 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt 2010-07-15 01:24:28.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -10,7 +10,7 @@
SOURCES ChanContinuation.C
COMM serial mpi
@@ -1035,9 +1284,9 @@
PASS_REGULAR_EXPRESSION "All tests passed"
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt 2010-07-15 01:24:28.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -21,7 +21,7 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA)
@@ -1047,9 +1296,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
TESTONLY
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt 2010-07-15 01:24:28.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -10,7 +10,7 @@
SOURCES BorderedSolve.C
COMM serial mpi
@@ -1086,9 +1335,9 @@
PASS_REGULAR_EXPRESSION "All tests passed"
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/lapack/NOX/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/lapack/NOX/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/lapack/NOX/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/lapack/NOX/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/lapack/NOX/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/lapack/NOX/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/lapack/NOX/CMakeLists.txt 2010-07-15 01:24:28.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/lapack/NOX/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
rosenbrock
@@ -1107,9 +1356,9 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/lapack/StatusTests/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/lapack/StatusTests/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/lapack/StatusTests/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/lapack/StatusTests/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/lapack/StatusTests/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/lapack/StatusTests/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/lapack/StatusTests/CMakeLists.txt 2010-07-15 01:24:29.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/lapack/StatusTests/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
StatusTests
@@ -1119,9 +1368,9 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt 2010-07-15 01:24:29.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
UserDefinedObjects
@@ -1131,10 +1380,19 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-diff -Nru trilinos-10.0.4-Source.orig/packages/nox/test/utils/CMakeLists.txt trilinos-10.0.4-Source/packages/nox/test/utils/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/nox/test/utils/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/nox/test/utils/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -24,7 +24,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/nox/test/utils/CMakeLists.txt trilinos-10.4.0-Source/packages/nox/test/utils/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/nox/test/utils/CMakeLists.txt 2010-07-15 01:24:29.000000000 +0200
++++ trilinos-10.4.0-Source/packages/nox/test/utils/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -4,7 +4,7 @@
+
+ SET(HEADERS "")
+ SET(SOURCES "")
+-SET(TESTUTILS_DEPLIBS nox)
++SET(TESTUTILS_DEPLIBS trilinos_nox)
+
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+@@ -26,7 +26,7 @@
ENDIF()
PACKAGE_ADD_LIBRARY(
@@ -1143,9 +1401,49 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
TESTONLY
-diff -Nru trilinos-10.0.4-Source.orig/packages/pamgen/src/CMakeLists.txt trilinos-10.0.4-Source/packages/pamgen/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/pamgen/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/pamgen/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/optika/src/CMakeLists.txt trilinos-10.4.0-Source/packages/optika/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/optika/src/CMakeLists.txt 2010-07-15 01:24:29.000000000 +0200
++++ trilinos-10.4.0-Source/packages/optika/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -27,10 +27,10 @@
+
+
+ PACKAGE_ADD_LIBRARY(
+- optika
++ trilinos_optika
+ HEADERS ${MOC_HDRS} ${HDRS}
+ SOURCES ${SRCS} ${MOC_SRCS}
+ DEPLIBS
+- teuchos ${TPL_Qt_LIBRARIES}
++ trilinos_teuchos ${TPL_Qt_LIBRARIES}
+ )
+
+diff -Nru trilinos-10.4.0-Source.orig/packages/optipack/src/CMakeLists.txt trilinos-10.4.0-Source/packages/optipack/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/optipack/src/CMakeLists.txt 2010-07-15 01:24:29.000000000 +0200
++++ trilinos-10.4.0-Source/packages/optipack/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -29,7 +29,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- optipack
++ trilinos_optipack
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/optipack/test/NonlinearCG/CMakeLists.txt trilinos-10.4.0-Source/packages/optipack/test/NonlinearCG/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/optipack/test/NonlinearCG/CMakeLists.txt 2010-07-15 01:24:29.000000000 +0200
++++ trilinos-10.4.0-Source/packages/optipack/test/NonlinearCG/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -6,7 +6,7 @@
+ SOURCES
+ NonlinearCG_UnitTests.cpp
+ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+- DEPLIBS thyra_nonlinear_test_models
++ DEPLIBS trilinos_thyra_nonlinear_test_models
+ COMM serial mpi
+ ARGS
+ " " # Make sure default works
+diff -Nru trilinos-10.4.0-Source.orig/packages/pamgen/src/CMakeLists.txt trilinos-10.4.0-Source/packages/pamgen/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/pamgen/src/CMakeLists.txt 2010-07-15 01:24:32.000000000 +0200
++++ trilinos-10.4.0-Source/packages/pamgen/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -208,13 +208,13 @@
#
@@ -1162,9 +1460,9 @@
HEADERS ${PE_HEADERS}
SOURCES ${PE_SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/src/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/phalanx/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/phalanx/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/phalanx/src/CMakeLists.txt trilinos-10.4.0-Source/packages/phalanx/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/phalanx/src/CMakeLists.txt 2010-07-15 01:24:32.000000000 +0200
++++ trilinos-10.4.0-Source/packages/phalanx/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -90,7 +90,7 @@
#
@@ -1174,9 +1472,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/DataContainer/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/DataContainer/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/phalanx/test/DataContainer/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/phalanx/test/DataContainer/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/phalanx/test/DataContainer/CMakeLists.txt trilinos-10.4.0-Source/packages/phalanx/test/DataContainer/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/phalanx/test/DataContainer/CMakeLists.txt 2010-07-15 01:24:33.000000000 +0200
++++ trilinos-10.4.0-Source/packages/phalanx/test/DataContainer/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -8,8 +8,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
data_container
@@ -1189,9 +1487,9 @@
- )
\ No newline at end of file
+ )
-diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/EvaluatorManager/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/EvaluatorManager/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/phalanx/test/EvaluatorManager/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/phalanx/test/EvaluatorManager/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/phalanx/test/EvaluatorManager/CMakeLists.txt trilinos-10.4.0-Source/packages/phalanx/test/EvaluatorManager/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/phalanx/test/EvaluatorManager/CMakeLists.txt 2010-07-15 01:24:33.000000000 +0200
++++ trilinos-10.4.0-Source/packages/phalanx/test/EvaluatorManager/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
evaluator_manager
@@ -1201,9 +1499,9 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/Field/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/Field/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/phalanx/test/Field/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/phalanx/test/Field/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/phalanx/test/Field/CMakeLists.txt trilinos-10.4.0-Source/packages/phalanx/test/Field/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/phalanx/test/Field/CMakeLists.txt 2010-07-15 01:24:33.000000000 +0200
++++ trilinos-10.4.0-Source/packages/phalanx/test/Field/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -9,7 +9,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
field
@@ -1256,9 +1554,9 @@
-#ENDIF(Phalanx_ENABLE_Intrepid)
\ No newline at end of file
+#ENDIF(Phalanx_ENABLE_Intrepid)
-diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/FieldTag/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/FieldTag/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/phalanx/test/FieldTag/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/phalanx/test/FieldTag/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/phalanx/test/FieldTag/CMakeLists.txt trilinos-10.4.0-Source/packages/phalanx/test/FieldTag/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/phalanx/test/FieldTag/CMakeLists.txt 2010-07-15 01:24:33.000000000 +0200
++++ trilinos-10.4.0-Source/packages/phalanx/test/FieldTag/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
field_tag
@@ -1268,9 +1566,9 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt trilinos-10.4.0-Source/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt 2010-07-15 01:24:33.000000000 +0200
++++ trilinos-10.4.0-Source/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -13,10 +13,10 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
intrepid_interoperability
@@ -1285,9 +1583,9 @@
-ENDIF(Phalanx_ENABLE_Intrepid)
\ No newline at end of file
+ENDIF(Phalanx_ENABLE_Intrepid)
-diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/Performance/Allocators/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/Performance/Allocators/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/phalanx/test/Performance/Allocators/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/phalanx/test/Performance/Allocators/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/phalanx/test/Performance/Allocators/CMakeLists.txt trilinos-10.4.0-Source/packages/phalanx/test/Performance/Allocators/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/phalanx/test/Performance/Allocators/CMakeLists.txt 2010-07-15 01:24:33.000000000 +0200
++++ trilinos-10.4.0-Source/packages/phalanx/test/Performance/Allocators/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -8,8 +8,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
performance_allocators
@@ -1300,9 +1598,9 @@
- )
\ No newline at end of file
+ )
-diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt trilinos-10.4.0-Source/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt 2010-07-15 01:24:33.000000000 +0200
++++ trilinos-10.4.0-Source/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -6,8 +6,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
performance_bracket_operator
@@ -1315,9 +1613,9 @@
- )
\ No newline at end of file
+ )
-diff -Nru trilinos-10.0.4-Source.orig/packages/phalanx/test/Utilities/CMakeLists.txt trilinos-10.0.4-Source/packages/phalanx/test/Utilities/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/phalanx/test/Utilities/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/phalanx/test/Utilities/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/phalanx/test/Utilities/CMakeLists.txt trilinos-10.4.0-Source/packages/phalanx/test/Utilities/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/phalanx/test/Utilities/CMakeLists.txt 2010-07-15 01:24:33.000000000 +0200
++++ trilinos-10.4.0-Source/packages/phalanx/test/Utilities/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -32,7 +32,7 @@
)
@@ -1339,49 +1637,21 @@
- )
\ No newline at end of file
+ )
-diff -Nru trilinos-10.0.4-Source.orig/packages/phdmesh/src/CMakeLists.txt trilinos-10.0.4-Source/packages/phdmesh/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/phdmesh/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/phdmesh/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -193,31 +193,31 @@
- #
-
- PACKAGE_ADD_LIBRARY(
-- phdelement_mesh
-+ trilinos_phdelement_mesh
- HEADERS ${ELEMENT_HEADERS}
- SOURCES ${ELEMENT_SOURCES}
- )
-
- PACKAGE_ADD_LIBRARY(
-- phdmesh_util
-+ trilinos_phdmesh_util
- HEADERS ${UTIL_HEADERS}
- SOURCES ${UTIL_SOURCES}
- )
-
- PACKAGE_ADD_LIBRARY(
-- phdmesh_mesh
-+ trilinos_phdmesh_mesh
- HEADERS ${MESH_HEADERS}
- SOURCES ${MESH_SOURCES}
- )
-
- PACKAGE_ADD_LIBRARY(
-- phdmesh_meshio
-+ trilinos_phdmesh_meshio
- HEADERS ${MESH_IO_HEADERS}
- SOURCES ${MESH_IO_SOURCES}
- )
-
- PACKAGE_ADD_LIBRARY(
-- phdmesh_txblas
-+ trilinos_phdmesh_txblas
- HEADERS ${TXBLAS_HEADERS}
- SOURCES ${TXBLAS_SOURCES}
- )
-diff -Nru trilinos-10.0.4-Source.orig/packages/pliris/src/CMakeLists.txt trilinos-10.0.4-Source/packages/pliris/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/pliris/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/pliris/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/piro/src/CMakeLists.txt trilinos-10.4.0-Source/packages/piro/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/piro/src/CMakeLists.txt 2010-07-15 01:24:33.000000000 +0200
++++ trilinos-10.4.0-Source/packages/piro/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -71,7 +71,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- piro
++ trilinos_piro
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/pliris/src/CMakeLists.txt trilinos-10.4.0-Source/packages/pliris/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/pliris/src/CMakeLists.txt 2010-07-15 01:24:34.000000000 +0200
++++ trilinos-10.4.0-Source/packages/pliris/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -145,7 +145,7 @@
MESSAGE(" Building the Z Complex library")
ADD_DEFINITIONS(-DZCPLX)
@@ -1418,16 +1688,16 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/PyTrilinos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/PyTrilinos/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/PyTrilinos/src/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/PyTrilinos/src/CMakeLists.txt 2010-01-08 14:15:01.000000000 +0100
-@@ -171,12 +171,12 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/PyTrilinos/src/CMakeLists.txt trilinos-10.4.0-Source/packages/PyTrilinos/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/PyTrilinos/src/CMakeLists.txt 2010-07-15 01:24:35.000000000 +0200
++++ trilinos-10.4.0-Source/packages/PyTrilinos/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -179,12 +179,12 @@
+
#
# Define the targets for the PyTrilinos library
- PACKAGE_ADD_LIBRARY(
-- pytrilinos
-+ trilinos_pytrilinos
- HEADERS ${HEADERS} ${CMAKE_CURRENT_BINARY_DIR}/${SWIG_RUNTIME}
+-PACKAGE_ADD_LIBRARY(pytrilinos
++PACKAGE_ADD_LIBRARY(trilinos_pytrilinos
+ HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
@@ -1436,19 +1706,19 @@
PROPERTIES LINK_FLAGS "${EXTRA_LINK_ARGS}"
)
-@@ -220,7 +220,7 @@
- # Add the SWIG module
- SWIG_ADD_MODULE(${PyTrilinos_TARGET_NAME} python "${MODULE_OUTDIR}"
- "${MODULE_NAME}" ${MODULE}.i)
+@@ -236,7 +236,7 @@
+ "${MODULE}.i"
+ "${MODULE_OUTDIR}"
+ "${MODULE_NAME}")
- SWIG_LINK_LIBRARIES(${PyTrilinos_TARGET_NAME} pytrilinos)
+ SWIG_LINK_LIBRARIES(${PyTrilinos_TARGET_NAME} trilinos_pytrilinos)
+ # Add the header file to the list of additional "make clean" files
+ LIST(APPEND ADDITIONAL_CLEAN_FILES "${MODULE}PYTHON_wrap.h")
#
- # Choosing the Trilinos libraries to link against, the python module
- # to byte-compile and the installation rules requires a little bit
-diff -Nru trilinos-10.0.4-Source.orig/packages/rtop/src/CMakeLists.txt trilinos-10.0.4-Source/packages/rtop/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/rtop/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/rtop/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -151,7 +151,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/rtop/src/CMakeLists.txt trilinos-10.4.0-Source/packages/rtop/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/rtop/src/CMakeLists.txt 2010-07-15 01:24:36.000000000 +0200
++++ trilinos-10.4.0-Source/packages/rtop/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -77,7 +77,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -1457,9 +1727,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/adapters/gaasp/src/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/adapters/gaasp/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/rythmos/adapters/gaasp/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/rythmos/adapters/gaasp/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/rythmos/adapters/gaasp/src/CMakeLists.txt trilinos-10.4.0-Source/packages/rythmos/adapters/gaasp/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/rythmos/adapters/gaasp/src/CMakeLists.txt 2010-07-15 01:24:36.000000000 +0200
++++ trilinos-10.4.0-Source/packages/rythmos/adapters/gaasp/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -31,10 +31,10 @@
#
@@ -1469,13 +1739,13 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- DEPLIBS rythmos gaasp
-+ DEPLIBS trilinos_rythmos gaasp
- )
-
-
-diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/adapters/gaasp/test/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/adapters/gaasp/test/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/rythmos/adapters/gaasp/test/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/rythmos/adapters/gaasp/test/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
++ DEPLIBS trilinos_rythmos trilinos_gaasp
+ )
+
+
+diff -Nru trilinos-10.4.0-Source.orig/packages/rythmos/adapters/gaasp/test/CMakeLists.txt trilinos-10.4.0-Source/packages/rythmos/adapters/gaasp/test/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/rythmos/adapters/gaasp/test/CMakeLists.txt 2010-07-15 01:24:37.000000000 +0200
++++ trilinos-10.4.0-Source/packages/rythmos/adapters/gaasp/test/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_gaasp_adapters
@@ -1485,9 +1755,9 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt trilinos-10.4.0-Source/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt 2010-07-15 01:24:37.000000000 +0200
++++ trilinos-10.4.0-Source/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -27,7 +27,7 @@
#
@@ -1497,9 +1767,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/example/diagonalTransient/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/example/diagonalTransient/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/rythmos/example/diagonalTransient/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/rythmos/example/diagonalTransient/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/rythmos/example/diagonalTransient/CMakeLists.txt trilinos-10.4.0-Source/packages/rythmos/example/diagonalTransient/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/rythmos/example/diagonalTransient/CMakeLists.txt 2010-07-15 01:24:37.000000000 +0200
++++ trilinos-10.4.0-Source/packages/rythmos/example/diagonalTransient/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
diagonalTransient
@@ -1509,9 +1779,9 @@
COMM serial mpi
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt trilinos-10.4.0-Source/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt 2010-07-15 01:24:37.000000000 +0200
++++ trilinos-10.4.0-Source/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
1DfemTransient
@@ -1521,9 +1791,9 @@
COMM serial mpi
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt trilinos-10.4.0-Source/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt 2010-07-15 01:24:37.000000000 +0200
++++ trilinos-10.4.0-Source/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
timeDiscretizedBackwardEuler
@@ -1533,9 +1803,9 @@
COMM serial mpi
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/rythmos/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/rythmos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/rythmos/src/CMakeLists.txt trilinos-10.4.0-Source/packages/rythmos/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/rythmos/src/CMakeLists.txt 2010-07-15 01:24:37.000000000 +0200
++++ trilinos-10.4.0-Source/packages/rythmos/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -31,7 +31,7 @@
#
@@ -1545,23 +1815,23 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-@@ -96,11 +96,11 @@
+@@ -109,11 +109,11 @@
+ ENDIF()
+
+ PACKAGE_ADD_LIBRARY(
+- rythmos_test_models
++ trilinos_rythmos_test_models
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ TESTONLY
+- DEPLIBS rythmos
++ DEPLIBS trilinos_rythmos
+ )
+
ENDIF()
-
- PACKAGE_ADD_LIBRARY(
-- rythmos_test_models
-+ trilinos_rythmos_test_models
- NOINSTALLHEADERS ${HEADERS}
- SOURCES ${SOURCES}
- TESTONLY
-- DEPLIBS rythmos
-+ DEPLIBS trilinos_rythmos
- )
-
-
-diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/test/Charon/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/test/Charon/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/rythmos/test/Charon/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/rythmos/test/Charon/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/rythmos/test/Charon/CMakeLists.txt trilinos-10.4.0-Source/packages/rythmos/test/Charon/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/rythmos/test/Charon/CMakeLists.txt 2010-07-15 01:24:38.000000000 +0200
++++ trilinos-10.4.0-Source/packages/rythmos/test/Charon/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -9,7 +9,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
CharonRythmos_UnitTest
@@ -1571,9 +1841,9 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/test/ConvergenceTest/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/test/ConvergenceTest/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/rythmos/test/ConvergenceTest/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/rythmos/test/ConvergenceTest/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/rythmos/test/ConvergenceTest/CMakeLists.txt trilinos-10.4.0-Source/packages/rythmos/test/ConvergenceTest/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/rythmos/test/ConvergenceTest/CMakeLists.txt 2010-07-15 01:24:38.000000000 +0200
++++ trilinos-10.4.0-Source/packages/rythmos/test/ConvergenceTest/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -23,7 +23,7 @@
SOURCES
${COMMON_SOURCES}
@@ -1583,9 +1853,9 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt trilinos-10.4.0-Source/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt 2010-07-15 01:24:38.000000000 +0200
++++ trilinos-10.4.0-Source/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
vdp
@@ -1595,9 +1865,9 @@
COMM serial mpi
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/test/simpleAdjoint/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/test/simpleAdjoint/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/rythmos/test/simpleAdjoint/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/rythmos/test/simpleAdjoint/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/rythmos/test/simpleAdjoint/CMakeLists.txt trilinos-10.4.0-Source/packages/rythmos/test/simpleAdjoint/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/rythmos/test/simpleAdjoint/CMakeLists.txt 2010-07-15 01:24:38.000000000 +0200
++++ trilinos-10.4.0-Source/packages/rythmos/test/simpleAdjoint/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
simpleAdjoint
@@ -1607,9 +1877,9 @@
COMM serial mpi
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/test/ThetaStepper/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/test/ThetaStepper/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/rythmos/test/ThetaStepper/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/rythmos/test/ThetaStepper/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/rythmos/test/ThetaStepper/CMakeLists.txt trilinos-10.4.0-Source/packages/rythmos/test/ThetaStepper/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/rythmos/test/ThetaStepper/CMakeLists.txt 2010-07-15 01:24:38.000000000 +0200
++++ trilinos-10.4.0-Source/packages/rythmos/test/ThetaStepper/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ThetaStepper_UnitTest
@@ -1619,9 +1889,9 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/rythmos/test/UnitTest/CMakeLists.txt trilinos-10.0.4-Source/packages/rythmos/test/UnitTest/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/rythmos/test/UnitTest/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/rythmos/test/UnitTest/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/rythmos/test/UnitTest/CMakeLists.txt trilinos-10.4.0-Source/packages/rythmos/test/UnitTest/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/rythmos/test/UnitTest/CMakeLists.txt 2010-07-15 01:24:38.000000000 +0200
++++ trilinos-10.4.0-Source/packages/rythmos/test/UnitTest/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -15,7 +15,7 @@
#PACKAGE_ADD_EXECUTABLE_AND_TEST(
# UnitTest
@@ -1648,8 +1918,8 @@
+ DEPLIBS trilinos_rythmos_test_models
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
- )
-@@ -39,7 +39,7 @@
+ XHOSTTYPE Darwin
+@@ -40,7 +40,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
DataStore_UnitTest
SOURCES Rythmos_DataStore_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1658,7 +1928,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -47,7 +47,7 @@
+@@ -48,7 +48,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
DefaultIntegrator_UnitTest
SOURCES Rythmos_DefaultIntegrator_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1667,7 +1937,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ExplicitRK_UnitTest
SOURCES Rythmos_ExplicitRK_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1676,16 +1946,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -63,7 +63,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- ForwardSensitivity_UnitTest
- SOURCES Rythmos_ForwardSensitivity_UnitTest.cpp Rythmos_UnitTest.cpp
-- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-@@ -71,7 +71,7 @@
+@@ -64,7 +64,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
HermiteInterpolator_UnitTest
SOURCES Rythmos_HermiteInterpolator_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1694,34 +1955,25 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -79,7 +79,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- ImplicitBDF_UnitTest
- SOURCES Rythmos_ImplicitBDF_UnitTest.cpp Rythmos_UnitTest.cpp
-- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-@@ -87,7 +87,7 @@
+@@ -72,7 +72,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ImplicitRK_UnitTest
SOURCES Rythmos_ImplicitRK_UnitTest.cpp Rythmos_UnitTest.cpp
- DEPLIBS rythmos_test_models
+ DEPLIBS trilinos_rythmos_test_models
- COMM serial
+ COMM serial # MPI should be okay (but see below)!
+ NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
- )
-@@ -95,7 +95,7 @@
+@@ -84,7 +84,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
IntegratorBuilder_UnitTest
SOURCES Rythmos_IntegratorBuilder_UnitTest.cpp Rythmos_UnitTest.cpp
- DEPLIBS rythmos_test_models
+ DEPLIBS trilinos_rythmos_test_models
- COMM serial
+ COMM serial # MPI should be okay (but see below)!
+ NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
- )
-@@ -103,7 +103,7 @@
+@@ -96,7 +96,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
InterpolationBuffer_UnitTest
SOURCES Rythmos_InterpolationBuffer_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1730,7 +1982,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -111,7 +111,7 @@
+@@ -104,7 +104,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
LinearInterpolator_UnitTest
SOURCES Rythmos_LinearInterpolator_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1739,7 +1991,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -120,7 +120,7 @@
+@@ -113,7 +113,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Quadrature_UnitTest
SOURCES Rythmos_Quadrature_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1748,7 +2000,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -129,7 +129,7 @@
+@@ -122,7 +122,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
RKButcherTableau_UnitTest
SOURCES Rythmos_RKButcherTableau_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1757,7 +2009,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -138,7 +138,7 @@
+@@ -131,7 +131,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
SinCosModel_UnitTest
SOURCES Rythmos_SinCosModel_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1766,16 +2018,52 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -147,7 +147,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- VanderPolModel_UnitTest
- SOURCES Rythmos_VanderPolModel_UnitTest.cpp Rythmos_UnitTest.cpp
-- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-@@ -156,7 +156,7 @@
+@@ -141,7 +141,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ VanderPolModel_UnitTest
+ SOURCES Rythmos_VanderPolModel_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -149,7 +149,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ AdjointModelEvaluator_UnitTest
+ SOURCES Rythmos_AdjointModelEvaluator_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -157,7 +157,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ForwardSensitivity_UnitTest
+ SOURCES Rythmos_ForwardSensitivity_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -165,7 +165,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ImplicitBDF_UnitTest
+ SOURCES Rythmos_ImplicitBDF_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -173,7 +173,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ BasicDiscreteAdjointStepperTester_UnitTest
+ SOURCES Rythmos_BasicDiscreteAdjointStepperTester_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ HOST None
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+@@ -183,7 +183,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
StepperBuilder_UnitTest
SOURCES Rythmos_StepperBuilder_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1784,7 +2072,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -165,7 +165,7 @@
+@@ -192,7 +192,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
StepperHelpers_UnitTest
SOURCES Rythmos_StepperHelpers_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1793,7 +2081,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -174,7 +174,7 @@
+@@ -201,7 +201,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
TimeRange_UnitTest
SOURCES Rythmos_TimeRange_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1802,7 +2090,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -182,7 +182,7 @@
+@@ -209,7 +209,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
PointwiseInterpolationBufferAppender_UnitTest
SOURCES Rythmos_PointwiseInterpolationBufferAppender_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1811,7 +2099,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -190,7 +190,7 @@
+@@ -217,7 +217,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
StepperValidator_UnitTest
SOURCES Rythmos_StepperValidator_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1820,7 +2108,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -198,7 +198,7 @@
+@@ -225,7 +225,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
GlobalErrorEstimator_UnitTest
SOURCES Rythmos_GlobalErrorEstimator_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1829,7 +2117,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -206,7 +206,7 @@
+@@ -233,7 +233,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Thyra_UnitTest
SOURCES Rythmos_Thyra_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1838,16 +2126,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -214,7 +214,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- AdjointModelEvaluator_UnitTest
- SOURCES Rythmos_AdjointModelEvaluator_UnitTest.cpp Rythmos_UnitTest.cpp
-- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-@@ -222,7 +222,7 @@
+@@ -241,7 +241,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ForwardEulerStepper_UnitTest
SOURCES Rythmos_ForwardEuler_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1856,7 +2135,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -230,7 +230,7 @@
+@@ -249,7 +249,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
BackwardEulerStepper_UnitTest
SOURCES Rythmos_BackwardEuler_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1865,7 +2144,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -238,7 +238,7 @@
+@@ -257,7 +257,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ForwardSensitivityExplicitModelEvaluator_UnitTest
SOURCES Rythmos_ForwardSensitivityExplicitModelEvaluator_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1874,7 +2153,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -246,7 +246,7 @@
+@@ -265,7 +265,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ForwardSensitivityImplicitModelEvaluator_UnitTest
SOURCES Rythmos_ForwardSensitivityImplicitModelEvaluator_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1883,7 +2162,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -254,7 +254,7 @@
+@@ -273,7 +273,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
StateSerializerStrategy_UnitTest
SOURCES Rythmos_StateSerializerStrategy_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1892,7 +2171,16 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -262,7 +262,7 @@
+@@ -281,7 +281,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ StackedStepper_UnitTest
+ SOURCES Rythmos_StackedStepper_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ COMM serial
+ STANDARD_PASS_OUTPUT
+ )
+@@ -289,7 +289,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ForwardSensitivityStepperTester_UnitTest
SOURCES Rythmos_ForwardSensitivityStepperTester_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -1901,16 +2189,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -270,7 +270,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- BasicDiscreteAdjointStepperTester_UnitTest
- SOURCES Rythmos_BasicDiscreteAdjointStepperTester_UnitTest.cpp Rythmos_UnitTest.cpp
-- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-@@ -278,7 +278,7 @@
+@@ -297,7 +297,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
TestModelBuilder_UnitTest
SOURCES Rythmos_TestModelBuilder_UnitTest.cpp Rythmos_UnitTest.cpp Rythmos_UnitTestModels.cpp
@@ -1919,22 +2198,10 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/sacado/example/FEApp/CMakeLists.txt trilinos-10.0.4-Source/packages/sacado/example/FEApp/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/sacado/example/FEApp/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/sacado/example/FEApp/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -100,7 +100,7 @@
- IF(Sacado_ENABLE_FEApp)
-
- PACKAGE_ADD_LIBRARY(
-- FEApp
-+ trilinos_FEApp
- HEADERS ${HEADERS}
- SOURCES ${SOURCES}
- )
-diff -Nru trilinos-10.0.4-Source.orig/packages/sacado/src/CMakeLists.txt trilinos-10.0.4-Source/packages/sacado/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/sacado/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/sacado/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -239,7 +239,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/sacado/src/CMakeLists.txt trilinos-10.4.0-Source/packages/sacado/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/sacado/src/CMakeLists.txt 2010-07-15 01:24:39.000000000 +0200
++++ trilinos-10.4.0-Source/packages/sacado/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -252,7 +252,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -1943,9 +2210,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/sacado/test/utils/CMakeLists.txt trilinos-10.0.4-Source/packages/sacado/test/utils/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/sacado/test/utils/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/sacado/test/utils/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/sacado/test/utils/CMakeLists.txt trilinos-10.4.0-Source/packages/sacado/test/utils/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/sacado/test/utils/CMakeLists.txt 2010-07-15 01:24:39.000000000 +0200
++++ trilinos-10.4.0-Source/packages/sacado/test/utils/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -35,9 +35,9 @@
#
@@ -1958,9 +2225,9 @@
+# DEPLIBS trilinos_sacado
# TESTONLY
# )
-diff -Nru trilinos-10.0.4-Source.orig/packages/shards/src/CMakeLists.txt trilinos-10.0.4-Source/packages/shards/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/shards/src/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/shards/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/shards/src/CMakeLists.txt trilinos-10.4.0-Source/packages/shards/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/shards/src/CMakeLists.txt 2010-07-15 01:24:40.000000000 +0200
++++ trilinos-10.4.0-Source/packages/shards/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -49,7 +49,7 @@
#
@@ -1970,10 +2237,118 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/stokhos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/stokhos/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/stokhos/src/CMakeLists.txt 2010-01-05 14:56:06.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/stokhos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -103,7 +103,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt trilinos-10.4.0-Source/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt 2010-07-15 01:24:40.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -39,7 +39,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_linsys
++ trilinos_stk_linsys
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt trilinos-10.4.0-Source/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2010-07-15 01:24:40.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -48,7 +48,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_mesh_base
++ trilinos_stk_mesh_base
+ NOINSTALLHEADERS ${HEADERS} ${HEADERS_IMPL}
+ SOURCES ${SOURCES} ${SOURCES_IMPL}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt trilinos-10.4.0-Source/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt 2010-07-15 01:24:40.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -38,7 +38,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_mesh_fem
++ trilinos_stk_mesh_fem
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/stk/stk_search/stk_search/CMakeLists.txt trilinos-10.4.0-Source/packages/stk/stk_search/stk_search/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stk/stk_search/stk_search/CMakeLists.txt 2010-07-15 01:24:41.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stk/stk_search/stk_search/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -54,7 +54,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_search
++ trilinos_stk_search
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2010-07-15 01:24:43.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -55,7 +55,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_util_diag
++ trilinos_stk_util_diag
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2010-07-15 01:24:43.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -63,7 +63,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_util_env
++ trilinos_stk_util_env
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2010-07-15 01:24:43.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -55,7 +55,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_util_parallel
++ trilinos_stk_util_parallel
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt 2010-07-15 01:24:43.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -43,7 +43,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_util_use_cases
++ trilinos_stk_util_use_cases
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/util/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2010-07-15 01:24:43.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -41,7 +41,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_util_util
++ trilinos_stk_util_util
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/stokhos/src/CMakeLists.txt trilinos-10.4.0-Source/packages/stokhos/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stokhos/src/CMakeLists.txt 2010-07-15 01:24:43.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stokhos/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -161,7 +161,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -1982,9 +2357,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/amesos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/stratimikos/adapters/amesos/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/amesos/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/stratimikos/adapters/amesos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/stratimikos/adapters/amesos/src/CMakeLists.txt trilinos-10.4.0-Source/packages/stratimikos/adapters/amesos/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stratimikos/adapters/amesos/src/CMakeLists.txt 2010-07-15 01:24:44.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stratimikos/adapters/amesos/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -16,7 +16,7 @@
)
@@ -1994,9 +2369,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt trilinos-10.0.4-Source/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt trilinos-10.4.0-Source/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt 2010-07-15 01:24:44.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -16,7 +16,7 @@
)
@@ -2006,10 +2381,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/belos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/stratimikos/adapters/belos/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/belos/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/stratimikos/adapters/belos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
-@@ -16,7 +16,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/stratimikos/adapters/belos/src/CMakeLists.txt trilinos-10.4.0-Source/packages/stratimikos/adapters/belos/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stratimikos/adapters/belos/src/CMakeLists.txt 2010-07-15 01:24:44.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stratimikos/adapters/belos/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -20,7 +20,7 @@
)
PACKAGE_ADD_LIBRARY(
@@ -2018,9 +2393,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt trilinos-10.0.4-Source/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt trilinos-10.4.0-Source/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt 2010-07-15 01:24:44.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -12,7 +12,7 @@
)
@@ -2030,9 +2405,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/ml/src/CMakeLists.txt trilinos-10.0.4-Source/packages/stratimikos/adapters/ml/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/stratimikos/adapters/ml/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/stratimikos/adapters/ml/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/stratimikos/adapters/ml/src/CMakeLists.txt trilinos-10.4.0-Source/packages/stratimikos/adapters/ml/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stratimikos/adapters/ml/src/CMakeLists.txt 2010-07-15 01:24:44.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stratimikos/adapters/ml/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -12,7 +12,7 @@
)
@@ -2042,9 +2417,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/stratimikos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/stratimikos/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/stratimikos/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/stratimikos/src/CMakeLists.txt 2010-01-08 14:12:00.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/stratimikos/src/CMakeLists.txt trilinos-10.4.0-Source/packages/stratimikos/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/stratimikos/src/CMakeLists.txt 2010-07-15 01:24:45.000000000 +0200
++++ trilinos-10.4.0-Source/packages/stratimikos/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -45,33 +45,33 @@
ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
@@ -2085,10 +2460,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
DEPLIBS ${DEPLIBS}
-diff -Nru trilinos-10.0.4-Source.orig/packages/Sundance/src-core/CMakeLists.txt trilinos-10.0.4-Source/packages/Sundance/src-core/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/Sundance/src-core/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/Sundance/src-core/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
-@@ -349,7 +349,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/Sundance/src-core/CMakeLists.txt trilinos-10.4.0-Source/packages/Sundance/src-core/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/Sundance/src-core/CMakeLists.txt 2010-07-15 01:24:46.000000000 +0200
++++ trilinos-10.4.0-Source/packages/Sundance/src-core/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -373,7 +373,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2097,9 +2472,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/Sundance/src-interop/CMakeLists.txt trilinos-10.0.4-Source/packages/Sundance/src-interop/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/Sundance/src-interop/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/Sundance/src-interop/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/Sundance/src-interop/CMakeLists.txt trilinos-10.4.0-Source/packages/Sundance/src-interop/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/Sundance/src-interop/CMakeLists.txt 2010-07-15 01:24:46.000000000 +0200
++++ trilinos-10.4.0-Source/packages/Sundance/src-interop/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -50,7 +50,7 @@
#
@@ -2109,10 +2484,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/Sundance/src-solvers/CMakeLists.txt trilinos-10.0.4-Source/packages/Sundance/src-solvers/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/Sundance/src-solvers/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/Sundance/src-solvers/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
-@@ -324,7 +324,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/Sundance/src-solvers/CMakeLists.txt trilinos-10.4.0-Source/packages/Sundance/src-solvers/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/Sundance/src-solvers/CMakeLists.txt 2010-07-15 01:24:46.000000000 +0200
++++ trilinos-10.4.0-Source/packages/Sundance/src-solvers/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -353,7 +353,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2121,10 +2496,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/Sundance/src-std-framework/CMakeLists.txt trilinos-10.0.4-Source/packages/Sundance/src-std-framework/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/Sundance/src-std-framework/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/Sundance/src-std-framework/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
-@@ -262,7 +262,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/Sundance/src-std-framework/CMakeLists.txt trilinos-10.4.0-Source/packages/Sundance/src-std-framework/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/Sundance/src-std-framework/CMakeLists.txt 2010-07-15 01:24:47.000000000 +0200
++++ trilinos-10.4.0-Source/packages/Sundance/src-std-framework/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -331,7 +331,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2133,10 +2508,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/Sundance/src-std-mesh/CMakeLists.txt trilinos-10.0.4-Source/packages/Sundance/src-std-mesh/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/Sundance/src-std-mesh/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/Sundance/src-std-mesh/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
-@@ -233,7 +233,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/Sundance/src-std-mesh/CMakeLists.txt trilinos-10.4.0-Source/packages/Sundance/src-std-mesh/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/Sundance/src-std-mesh/CMakeLists.txt 2010-07-15 01:24:48.000000000 +0200
++++ trilinos-10.4.0-Source/packages/Sundance/src-std-mesh/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -317,7 +317,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2145,9 +2520,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/Sundance/src-utils/CMakeLists.txt trilinos-10.0.4-Source/packages/Sundance/src-utils/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/Sundance/src-utils/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/Sundance/src-utils/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/Sundance/src-utils/CMakeLists.txt trilinos-10.4.0-Source/packages/Sundance/src-utils/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/Sundance/src-utils/CMakeLists.txt 2010-07-15 01:24:48.000000000 +0200
++++ trilinos-10.4.0-Source/packages/Sundance/src-utils/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -94,7 +94,7 @@
#
@@ -2157,10 +2532,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/teuchos/src/CMakeLists.txt trilinos-10.0.4-Source/packages/teuchos/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/teuchos/src/CMakeLists.txt 2010-01-05 14:56:09.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/teuchos/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
-@@ -289,7 +289,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/teuchos/src/CMakeLists.txt trilinos-10.4.0-Source/packages/teuchos/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/teuchos/src/CMakeLists.txt 2010-07-15 01:24:49.000000000 +0200
++++ trilinos-10.4.0-Source/packages/teuchos/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -298,7 +298,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2168,10 +2543,34 @@
+ trilinos_teuchos
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- )
-diff -Nru trilinos-10.0.4-Source.orig/packages/ThreadPool/src/CMakeLists.txt trilinos-10.0.4-Source/packages/ThreadPool/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/ThreadPool/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/ThreadPool/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+ DEFINES -DTEUCHOS_LIB_EXPORTS_MODE
+diff -Nru trilinos-10.4.0-Source.orig/packages/teuchos/test/FancyOutputting/CMakeLists.txt trilinos-10.4.0-Source/packages/teuchos/test/FancyOutputting/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/teuchos/test/FancyOutputting/CMakeLists.txt 2010-07-15 01:24:50.000000000 +0200
++++ trilinos-10.4.0-Source/packages/teuchos/test/FancyOutputting/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -2,17 +2,17 @@
+ INCLUDE(PackageAddExecutableAndTest)
+
+ PACKAGE_ADD_LIBRARY(
+- teuchos_algorithma
++ trilinos_teuchos_algorithma
+ HEADERS AlgorithmA.hpp
+ SOURCES AlgorithmA.cpp
+- DEPLIBS teuchos
++ DEPLIBS trilinos_teuchos
+ TESTONLY
+ )
+
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ FancyOutputting_test
+ SOURCES FancyOutputting_test.cpp
+- DEPLIBS teuchos_algorithma
++ DEPLIBS trilinos_teuchos_algorithma
+ COMM serial mpi
+ STANDARD_PASS_OUTPUT
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/ThreadPool/src/CMakeLists.txt trilinos-10.4.0-Source/packages/ThreadPool/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/ThreadPool/src/CMakeLists.txt 2010-07-15 01:24:51.000000000 +0200
++++ trilinos-10.4.0-Source/packages/ThreadPool/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -64,7 +64,7 @@
#
@@ -2181,11 +2580,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/thyra/adapters/epetra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/thyra/adapters/epetra/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/thyra/adapters/epetra/src/CMakeLists.txt 2010-01-05 14:56:09.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/thyra/adapters/epetra/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
-@@ -25,8 +25,8 @@
- )
+diff -Nru trilinos-10.4.0-Source.orig/packages/thyra/adapters/epetra/src/CMakeLists.txt trilinos-10.4.0-Source/packages/thyra/adapters/epetra/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/thyra/adapters/epetra/src/CMakeLists.txt 2010-07-15 01:24:51.000000000 +0200
++++ trilinos-10.4.0-Source/packages/thyra/adapters/epetra/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -10,8 +10,8 @@
+ APPEND_GLOB(SOURCES ${DIR}/*.cpp)
PACKAGE_ADD_LIBRARY(
- thyraepetra
@@ -2195,9 +2594,9 @@
- DEPLIBS thyra
+ DEPLIBS trilinos_thyra
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/thyra/adapters/epetraext/src/CMakeLists.txt trilinos-10.0.4-Source/packages/thyra/adapters/epetraext/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/thyra/adapters/epetraext/src/CMakeLists.txt 2010-01-05 14:56:09.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/thyra/adapters/epetraext/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/thyra/adapters/epetraext/src/CMakeLists.txt trilinos-10.4.0-Source/packages/thyra/adapters/epetraext/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/thyra/adapters/epetraext/src/CMakeLists.txt 2010-07-15 01:24:51.000000000 +0200
++++ trilinos-10.4.0-Source/packages/thyra/adapters/epetraext/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -13,8 +13,8 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
@@ -2209,10 +2608,31 @@
- DEPLIBS thyraepetra
+ DEPLIBS trilinos_thyraepetra
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/thyra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/thyra/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/thyra/src/CMakeLists.txt 2010-01-05 14:56:09.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/thyra/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
-@@ -71,7 +71,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/thyra/adapters/tpetra/src/CMakeLists.txt trilinos-10.4.0-Source/packages/thyra/adapters/tpetra/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/thyra/adapters/tpetra/src/CMakeLists.txt 2010-07-15 01:24:51.000000000 +0200
++++ trilinos-10.4.0-Source/packages/thyra/adapters/tpetra/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -12,14 +12,14 @@
+
+ ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Epetra)
+ IF (${PACKAGE_NAME}_ENABLE_Epetra)
+- SET(DEPSLIBS thyraepetra)
++ SET(DEPSLIBS trilinos_thyraepetra)
+ ELSE()
+- SET(DEPSLIBS thyra)
++ SET(DEPSLIBS trilinos_thyra)
+ ENDIF()
+
+
+ PACKAGE_ADD_LIBRARY(
+- thyratpetra
++ trilinos_thyratpetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ DEPLIBS ${DEPSLIBS}
+diff -Nru trilinos-10.4.0-Source.orig/packages/thyra/src/CMakeLists.txt trilinos-10.4.0-Source/packages/thyra/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/thyra/src/CMakeLists.txt 2010-07-15 01:24:52.000000000 +0200
++++ trilinos-10.4.0-Source/packages/thyra/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -86,7 +86,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2221,26 +2641,25 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/thyra/test/nonlinear/models/CMakeLists.txt trilinos-10.0.4-Source/packages/thyra/test/nonlinear/models/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/thyra/test/nonlinear/models/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/thyra/test/nonlinear/models/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
-@@ -10,11 +10,11 @@
- APPEND_GLOB(SOURCES *.cpp)
+diff -Nru trilinos-10.4.0-Source.orig/packages/thyra/test/nonlinear/models/CMakeLists.txt trilinos-10.4.0-Source/packages/thyra/test/nonlinear/models/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/thyra/test/nonlinear/models/CMakeLists.txt 2010-07-15 01:24:53.000000000 +0200
++++ trilinos-10.4.0-Source/packages/thyra/test/nonlinear/models/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -13,10 +13,10 @@
+ APPEND_GLOB(HEADERS ${DIR}/*.hpp)
PACKAGE_ADD_LIBRARY(
- thyra_nonlinear_test_models
+ trilinos_thyra_nonlinear_test_models
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- TESTONLY
- DEPLIBS thyra
+ DEPLIBS trilinos_thyra
- )
-
- ADD_SUBDIRECTORY(UnitTests)
-diff -Nru trilinos-10.0.4-Source.orig/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt trilinos-10.0.4-Source/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+ TESTONLY
+ )
+
+diff -Nru trilinos-10.4.0-Source.orig/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt trilinos-10.4.0-Source/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt 2010-07-15 01:24:53.000000000 +0200
++++ trilinos-10.4.0-Source/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -6,7 +6,7 @@
SOURCES
Simple2DModelEvaluator_UnitTests.cpp
@@ -2250,10 +2669,74 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/tpetra/src/CMakeLists.txt trilinos-10.0.4-Source/packages/tpetra/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/tpetra/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/tpetra/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
-@@ -80,7 +80,7 @@
+@@ -17,7 +17,7 @@
+ SOURCES
+ DiagonalQuadraticResponseOnlyModelEvaluator_UnitTests.cpp
+ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+- DEPLIBS thyra_nonlinear_test_models
++ DEPLIBS trilinos_thyra_nonlinear_test_models
+ COMM serial mpi
+ )
+
+diff -Nru trilinos-10.4.0-Source.orig/packages/tifpack/src/CMakeLists.txt trilinos-10.4.0-Source/packages/tifpack/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/tifpack/src/CMakeLists.txt 2010-07-15 01:24:53.000000000 +0200
++++ trilinos-10.4.0-Source/packages/tifpack/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -72,7 +72,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- tifpack
++ trilinos_tifpack
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/tifpack/test/belos/CMakeLists.txt trilinos-10.4.0-Source/packages/tifpack/test/belos/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/tifpack/test/belos/CMakeLists.txt 2010-07-15 01:24:54.000000000 +0200
++++ trilinos-10.4.0-Source/packages/tifpack/test/belos/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -25,14 +25,14 @@
+ PACKAGE_ADD_EXECUTABLE(
+ tif_belos
+ SOURCES belos_solve.cpp
+- DEPLIBS belos tpetra kokkos teuchos
++ DEPLIBS trilinos_belos trilinos_tpetra trilinos_kokkos trilinos_teuchos
+ )
+
+ IF(Tifpack_ENABLE_QD)
+ PACKAGE_ADD_EXECUTABLE(
+ tif_extprec_belos
+ SOURCES belos_extprec_solve.cpp
+- DEPLIBS belos tpetra kokkos teuchos
++ DEPLIBS trilinos_belos trilinos_tpetra trilinos_kokkos trilinos_teuchos
+ )
+ ENDIF()
+
+diff -Nru trilinos-10.4.0-Source.orig/packages/tifpack/test/unit_tests/CMakeLists.txt trilinos-10.4.0-Source/packages/tifpack/test/unit_tests/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/tifpack/test/unit_tests/CMakeLists.txt 2010-07-15 01:24:54.000000000 +0200
++++ trilinos-10.4.0-Source/packages/tifpack/test/unit_tests/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -40,6 +40,6 @@
+ ARGS ""
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS tpetra kokkos teuchos
++ DEPLIBS trilinos_tpetra trilinos_kokkos trilinos_teuchos
+ )
+
+diff -Nru trilinos-10.4.0-Source.orig/packages/tpetra/inout/CMakeLists.txt trilinos-10.4.0-Source/packages/tpetra/inout/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/tpetra/inout/CMakeLists.txt 2010-07-15 01:24:54.000000000 +0200
++++ trilinos-10.4.0-Source/packages/tpetra/inout/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -41,7 +41,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- tpetrainout
++ trilinos_tpetrainout
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ DEPLIBS tpetra
+diff -Nru trilinos-10.4.0-Source.orig/packages/tpetra/src/CMakeLists.txt trilinos-10.4.0-Source/packages/tpetra/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/tpetra/src/CMakeLists.txt 2010-07-15 01:24:54.000000000 +0200
++++ trilinos-10.4.0-Source/packages/tpetra/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -33,7 +33,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2262,9 +2745,21 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/tpetra/test/MultiVector/CMakeLists.txt trilinos-10.0.4-Source/packages/tpetra/test/MultiVector/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/tpetra/test/MultiVector/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/tpetra/test/MultiVector/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/tpetra/test/BasicPerfTest/CMakeLists.txt trilinos-10.4.0-Source/packages/tpetra/test/BasicPerfTest/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/tpetra/test/BasicPerfTest/CMakeLists.txt 2010-07-15 01:24:54.000000000 +0200
++++ trilinos-10.4.0-Source/packages/tpetra/test/BasicPerfTest/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -20,7 +20,7 @@
+ # ARGS
+ COMM mpi # serial
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi tpetrainout tpetratestlib
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi trilinos_tpetrainout trilinos_tpetratestlib
+ )
+
+ PACKAGE_COPY_FILES_TO_BINARY_DIR(Tpetra_HybridPlatformTest_Files1
+diff -Nru trilinos-10.4.0-Source.orig/packages/tpetra/test/BlockMultiVector/CMakeLists.txt trilinos-10.4.0-Source/packages/tpetra/test/BlockMultiVector/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/tpetra/test/BlockMultiVector/CMakeLists.txt 2010-07-15 01:24:54.000000000 +0200
++++ trilinos-10.4.0-Source/packages/tpetra/test/BlockMultiVector/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -9,5 +9,5 @@
${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
COMM serial mpi
@@ -2272,9 +2767,79 @@
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/trilinoscouplings/examples/scaling/CMakeLists.txt trilinos-10.0.4-Source/packages/trilinoscouplings/examples/scaling/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/trilinoscouplings/examples/scaling/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/trilinoscouplings/examples/scaling/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/tpetra/test/CMakeLists.txt trilinos-10.4.0-Source/packages/tpetra/test/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/tpetra/test/CMakeLists.txt 2010-07-15 01:24:54.000000000 +0200
++++ trilinos-10.4.0-Source/packages/tpetra/test/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -18,9 +18,9 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- tpetratestlib
++ trilinos_tpetratestlib
+ SOURCES UnitTestMissingExplicitInstantiations.cpp
+- DEPLIBS tpetra teuchos
++ DEPLIBS trilinos_tpetra trilinos_teuchos
+ TESTONLY
+ )
+
+diff -Nru trilinos-10.4.0-Source.orig/packages/tpetra/test/CrsMatrix/CMakeLists.txt trilinos-10.4.0-Source/packages/tpetra/test/CrsMatrix/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/tpetra/test/CrsMatrix/CMakeLists.txt 2010-07-15 01:24:54.000000000 +0200
++++ trilinos-10.4.0-Source/packages/tpetra/test/CrsMatrix/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -17,7 +17,7 @@
+ ARGS ${ARGS}
+ COMM serial mpi
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi tpetratestlib
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi trilinos_tpetratestlib
+ )
+
+ # PACKAGE_ADD_EXECUTABLE_AND_TEST(
+@@ -28,7 +28,7 @@
+ # ARGS ${ARGS}
+ # COMM serial mpi
+ # STANDARD_PASS_OUTPUT
+-# DEPLIBS kokkos kokkoslinalg kokkosnodeapi tpetrainout tpetratestlib
++# DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi trilinos_tpetrainout trilinos_tpetratestlib
+ # )
+
+ PACKAGE_COPY_FILES_TO_BINARY_DIR(TpetraCrsMatrixCopyFiles
+diff -Nru trilinos-10.4.0-Source.orig/packages/tpetra/test/MultiVector/CMakeLists.txt trilinos-10.4.0-Source/packages/tpetra/test/MultiVector/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/tpetra/test/MultiVector/CMakeLists.txt 2010-07-15 01:24:55.000000000 +0200
++++ trilinos-10.4.0-Source/packages/tpetra/test/MultiVector/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -9,5 +9,5 @@
+ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+ COMM serial mpi
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+diff -Nru trilinos-10.4.0-Source.orig/packages/tpetra/test/VbrMatrix/CMakeLists.txt trilinos-10.4.0-Source/packages/tpetra/test/VbrMatrix/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/tpetra/test/VbrMatrix/CMakeLists.txt 2010-07-15 01:24:55.000000000 +0200
++++ trilinos-10.4.0-Source/packages/tpetra/test/VbrMatrix/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -14,7 +14,7 @@
+ SOURCES
+ VbrMatrix_UnitTests
+ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi tpetratestlib
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi trilinos_tpetratestlib
+ )
+
+ PACKAGE_ADD_TEST(
+diff -Nru trilinos-10.4.0-Source.orig/packages/TriKota/src/CMakeLists.txt trilinos-10.4.0-Source/packages/TriKota/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/TriKota/src/CMakeLists.txt 2010-07-15 01:24:55.000000000 +0200
++++ trilinos-10.4.0-Source/packages/TriKota/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -164,7 +164,7 @@
+ ADD_DEFINITIONS(-DHAVE_CONFIG_H)
+
+ PACKAGE_ADD_LIBRARY(
+- trikota
++ trilinos_trikota
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ IMPORTEDLIBS ${DAKOTA_LIBS}
+diff -Nru trilinos-10.4.0-Source.orig/packages/trilinoscouplings/examples/scaling/CMakeLists.txt trilinos-10.4.0-Source/packages/trilinoscouplings/examples/scaling/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/trilinoscouplings/examples/scaling/CMakeLists.txt 2010-07-15 01:24:55.000000000 +0200
++++ trilinos-10.4.0-Source/packages/trilinoscouplings/examples/scaling/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -8,21 +8,21 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_Poisson
@@ -2300,9 +2865,9 @@
NUM_MPI_PROCS 1
ADD_DIR_TO_NAME
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/trilinoscouplings/src/CMakeLists.txt trilinos-10.0.4-Source/packages/trilinoscouplings/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/trilinoscouplings/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/trilinoscouplings/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/trilinoscouplings/src/CMakeLists.txt trilinos-10.4.0-Source/packages/trilinoscouplings/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/trilinoscouplings/src/CMakeLists.txt 2010-07-15 01:24:55.000000000 +0200
++++ trilinos-10.4.0-Source/packages/trilinoscouplings/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -153,7 +153,7 @@
#
@@ -2312,9 +2877,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/triutils/src/CMakeLists.txt trilinos-10.0.4-Source/packages/triutils/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/triutils/src/CMakeLists.txt 2010-01-05 14:56:08.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/triutils/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/triutils/src/CMakeLists.txt trilinos-10.4.0-Source/packages/triutils/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/triutils/src/CMakeLists.txt 2010-07-15 01:24:56.000000000 +0200
++++ trilinos-10.4.0-Source/packages/triutils/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -78,7 +78,7 @@
#
@@ -2324,9 +2889,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt trilinos-10.0.4-Source/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
+diff -Nru trilinos-10.4.0-Source.orig/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt trilinos-10.4.0-Source/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt 2010-07-15 01:24:58.000000000 +0200
++++ trilinos-10.4.0-Source/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
@@ -466,7 +466,7 @@
#
@@ -2336,10 +2901,15 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-diff -Nru trilinos-10.0.4-Source.orig/packages/zoltan/src/CMakeLists.txt trilinos-10.0.4-Source/packages/zoltan/src/CMakeLists.txt
---- trilinos-10.0.4-Source.orig/packages/zoltan/src/CMakeLists.txt 2010-01-05 14:56:07.000000000 +0100
-+++ trilinos-10.0.4-Source/packages/zoltan/src/CMakeLists.txt 2010-01-08 14:12:01.000000000 +0100
-@@ -744,7 +744,7 @@
+diff -Nru trilinos-10.4.0-Source.orig/packages/zoltan/src/CMakeLists.txt trilinos-10.4.0-Source/packages/zoltan/src/CMakeLists.txt
+--- trilinos-10.4.0-Source.orig/packages/zoltan/src/CMakeLists.txt 2010-07-15 01:24:59.000000000 +0200
++++ trilinos-10.4.0-Source/packages/zoltan/src/CMakeLists.txt 2010-08-13 16:23:25.000000000 +0200
+@@ -764,11 +764,11 @@
+ #
+
+ IF (NOT TPL_ENABLE_MPI)
+- SET(DEPLIBS simpi)
++ SET(DEPLIBS trilinos_simpi)
ENDIF()
PACKAGE_ADD_LIBRARY(
Modified: packages/trilinos/trunk/debian/patches/soname.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/soname.patch?rev=36813&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/soname.patch (original)
+++ packages/trilinos/trunk/debian/patches/soname.patch Fri Aug 13 14:43:00 2010
@@ -1,10 +1,10 @@
-diff -Nru trilinos-10.2.0-Source.orig/cmake/package_arch/PackageLibraryMacros.cmake trilinos-10.2.0-Source/cmake/package_arch/PackageLibraryMacros.cmake
---- trilinos-10.2.0-Source.orig/cmake/package_arch/PackageLibraryMacros.cmake 2009-12-08 19:34:03.000000000 +0100
-+++ trilinos-10.2.0-Source/cmake/package_arch/PackageLibraryMacros.cmake 2009-12-15 12:17:13.000000000 +0100
-@@ -147,6 +147,12 @@
+diff -Nru trilinos-10.4.0-Source.orig/cmake/package_arch/PackageLibraryMacros.cmake trilinos-10.4.0-Source/cmake/package_arch/PackageLibraryMacros.cmake
+--- trilinos-10.4.0-Source.orig/cmake/package_arch/PackageLibraryMacros.cmake 2010-07-15 01:23:50.000000000 +0200
++++ trilinos-10.4.0-Source/cmake/package_arch/PackageLibraryMacros.cmake 2010-08-13 16:28:02.000000000 +0200
+@@ -168,6 +168,12 @@
SET_PROPERTY(TARGET ${LIBRARY_NAME} APPEND PROPERTY
LABELS ${PACKAGE_NAME})
-
+
+ # Apply user-defined properties to the library target.
+ IF(Trilinos_LIBRARY_PROPERTIES)
+ SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES
@@ -13,4 +13,4 @@
+
PREPEND_GLOBAL_SET(${PACKAGE_NAME}_LIB_TARGETS ${LIBRARY_NAME})
PREPEND_GLOBAL_SET(${PACKAGE_NAME}_ALL_TARGETS ${LIBRARY_NAME})
-
+
Modified: packages/trilinos/trunk/debian/patches/trilinosversion.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/trilinosversion.patch?rev=36813&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/trilinosversion.patch (original)
+++ packages/trilinos/trunk/debian/patches/trilinosversion.patch Fri Aug 13 14:43:00 2010
@@ -1,22 +1,24 @@
-Index: trilinos-10.2.0.dfsg/cmake/TrilinosVersion.cmake
-===================================================================
---- trilinos-10.2.0.dfsg.orig/cmake/TrilinosVersion.cmake 2010-05-02 11:52:26.000000000 +0200
-+++ trilinos-10.2.0.dfsg/cmake/TrilinosVersion.cmake 2010-05-02 11:54:17.000000000 +0200
-@@ -11,3 +11,17 @@
+diff -Nru trilinos-10.4.0-Source.orig/cmake/TrilinosVersion.cmake trilinos-10.4.0-Source/cmake/TrilinosVersion.cmake
+--- trilinos-10.4.0-Source.orig/cmake/TrilinosVersion.cmake 2010-07-15 01:23:51.000000000 +0200
++++ trilinos-10.4.0-Source/cmake/TrilinosVersion.cmake 2010-08-13 16:35:56.000000000 +0200
+@@ -1,5 +1,6 @@
+ SET(Trilinos_VERSION "10.4.0")
+ SET(Trilinos_MAJOR_VERSION "10")
++SET(Trilinos_MINOR_VERSION "4")
+ SET(Trilinos_MAJOR_MINOR_VERSION "100400")
+ SET(Trilinos_VERSION_STRING "10.4.0")
+
+@@ -11,3 +12,13 @@
SET(TRILINOS_MAJOR_VERSION TRUE)
SET(TRILINOS_MAJOR_MINOR_VERSION TRUE)
SET(TRILINOS_VERSION_STRING TRUE)
+
-+SET(Trilinos_VERSION_MAJOR 10)
-+SET(Trilinos_VERSION_MINOR 2)
-+SET(Trilinos_VERSION_PATCH 0)
-+
+IF(NOT Trilinos_NO_LIBRARY_VERSION)
+ # This setting of SOVERSION assumes that any API change
-+ # will increment either the minor or major version number of ITK.
++ # will increment either the minor or major version number of Trilinos.
+ SET(Trilinos_LIBRARY_PROPERTIES
-+ VERSION "${Trilinos_VERSION_MAJOR}.${Trilinos_VERSION_MINOR}.${Trilinos_VERSION_PATCH}"
-+ SOVERSION "${Trilinos_VERSION_MAJOR}.${Trilinos_VERSION_MINOR}"
++ VERSION "${Trilinos_VERSION}"
++ SOVERSION "${Trilinos_MAJOR_VERSION}.${Trilinos_MINOR_VERSION}"
+ )
+ENDIF(NOT Trilinos_NO_LIBRARY_VERSION)
+
More information about the debian-science-commits
mailing list