r36815 - /packages/trilinos/trunk/debian/patches/libname.patch
johannr-guest at users.alioth.debian.org
johannr-guest at users.alioth.debian.org
Sat Aug 14 13:47:17 UTC 2010
Author: johannr-guest
Date: Sat Aug 14 13:47:15 2010
New Revision: 36815
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36815
Log:
Fix libname patch
Modified:
packages/trilinos/trunk/debian/patches/libname.patch
Modified: packages/trilinos/trunk/debian/patches/libname.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/libname.patch?rev=36815&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/libname.patch (original)
+++ packages/trilinos/trunk/debian/patches/libname.patch Sat Aug 14 13:47:15 2010
@@ -1,6 +1,6 @@
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
++++ trilinos-10.4.0-Source/packages/amesos/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -465,7 +465,7 @@
#
@@ -12,7 +12,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/anasazi/epetra/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -45,9 +45,9 @@
#
@@ -27,7 +27,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -62,9 +62,9 @@
#
@@ -42,7 +42,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/anasazi/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -142,7 +142,7 @@
#
@@ -54,7 +54,7 @@
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
++++ trilinos-10.4.0-Source/packages/anasazi/thyra/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -111,7 +111,7 @@
#
@@ -66,7 +66,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/aztecoo/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -173,7 +173,7 @@
#
@@ -78,7 +78,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/belos/epetra/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -39,8 +39,8 @@
#
@@ -92,7 +92,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/belos/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -103,7 +103,7 @@
#
@@ -104,7 +104,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
++++ trilinos-10.4.0-Source/packages/belos/tpetra/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -37,8 +37,8 @@
#
@@ -118,7 +118,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/CTrilinos/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -109,7 +109,7 @@
#
@@ -130,7 +130,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/epetra/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -225,7 +225,7 @@
#
@@ -142,7 +142,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
++++ trilinos-10.4.0-Source/packages/epetraext/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -432,7 +432,7 @@
#
@@ -154,7 +154,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
++++ trilinos-10.4.0-Source/packages/fei/base/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -241,7 +241,7 @@
#
@@ -166,7 +166,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
++++ trilinos-10.4.0-Source/packages/fei/support-Trilinos/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -75,7 +75,7 @@
#
@@ -178,7 +178,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/fei/test_utils/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -135,7 +135,7 @@
#
@@ -190,7 +190,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/galeri/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -146,7 +146,7 @@
#
@@ -202,7 +202,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
++++ trilinos-10.4.0-Source/packages/globipack/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -29,7 +29,7 @@
#
@@ -214,7 +214,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/globipack/test/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -22,7 +22,7 @@
SOURCES
ArmijoPolyInterpLineSearch_UnitTests.cpp
@@ -253,7 +253,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/globipack/test/meritfuncs/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -14,11 +14,11 @@
APPEND_GLOB(HEADERS ${DIR}/*.hpp)
@@ -270,7 +270,7 @@
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
++++ trilinos-10.4.0-Source/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -6,7 +6,7 @@
SOURCES
TestLagrPolyMeritFunc1D_UnitTests.cpp
@@ -282,7 +282,7 @@
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
++++ trilinos-10.4.0-Source/packages/ifpack/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -232,7 +232,7 @@
#
@@ -294,7 +294,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/ifpack/test/AztecOO/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -17,7 +17,7 @@
PACKAGE_ADD_EXECUTABLE(
ifp_aztecoo
@@ -306,7 +306,7 @@
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
++++ trilinos-10.4.0-Source/packages/intrepid/example/Drivers/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -4,7 +4,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_01
@@ -354,7 +354,7 @@
# 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
++++ trilinos-10.4.0-Source/packages/intrepid/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -199,7 +199,7 @@
#
@@ -366,7 +366,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/isorropia/example/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -8,6 +8,6 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
matrix_1
@@ -377,7 +377,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/isorropia/example/geometric/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
example_rcb
@@ -389,7 +389,7 @@
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
++++ trilinos-10.4.0-Source/packages/isorropia/example/levelSchedule/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
levelSchedule
@@ -401,7 +401,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
++++ trilinos-10.4.0-Source/packages/isorropia/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -173,7 +173,7 @@
#
@@ -413,7 +413,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/isorropia/test/geometric/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_geometric
@@ -425,7 +425,7 @@
"--f=brack_3D.coords"
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
++++ trilinos-10.4.0-Source/packages/isorropia/test/levelsolver/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -7,7 +7,7 @@
COMM serial mpi
ARGS
@@ -437,7 +437,7 @@
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
++++ trilinos-10.4.0-Source/packages/isorropia/test/mtx/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_balanced_copy
@@ -467,7 +467,7 @@
"--f=simple.mtx"
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
++++ trilinos-10.4.0-Source/packages/isorropia/test/part_sizes/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
part_sizes
@@ -479,7 +479,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/isorropia/test/probing/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -5,7 +5,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_probing
@@ -491,7 +491,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/isorropia/utils/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -33,9 +33,9 @@
#
@@ -506,7 +506,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/kokkos/LinAlg/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -64,7 +64,7 @@
IF (Kokkos_ENABLE_Thrust)
# this pulls in Thrust, CUSP, and Kokkos/NodeAPI
@@ -531,7 +531,7 @@
PACKAGE_ADD_TEST_DIRECTORIES(test)
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
++++ trilinos-10.4.0-Source/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -6,7 +6,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -550,7 +550,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -6,7 +6,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -569,7 +569,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -6,5 +6,5 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -579,7 +579,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -8,5 +8,5 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -589,7 +589,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/kokkos/NodeAPI/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -101,10 +101,10 @@
#
@@ -605,7 +605,7 @@
PACKAGE_ADD_TEST_DIRECTORIES(test)
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
++++ trilinos-10.4.0-Source/packages/kokkos/NodeAPI/test/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -15,7 +15,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -624,7 +624,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/kokkos/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -44,7 +44,7 @@
#
@@ -636,7 +636,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/komplex/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -69,7 +69,7 @@
#
@@ -648,7 +648,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/meros/src/CMakeLists.txt 2010-08-14 15:28:01.000000000 +0200
@@ -84,7 +84,7 @@
#
@@ -660,7 +660,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
++++ trilinos-10.4.0-Source/packages/meros/thyra/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -9,7 +9,7 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
@@ -672,7 +672,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/mesquite/itaps/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -9,7 +9,7 @@
SET(${PACKAGE_NAME}_ENABLE_IMESH ON)
MAKEFILE_VAL(${IMESH_DEFS} IMESH_LIBS IMESH_LIBS)
@@ -710,7 +710,7 @@
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
++++ trilinos-10.4.0-Source/packages/mesquite/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -936,7 +936,7 @@
#
@@ -722,7 +722,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/mesquite/utils/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -35,7 +35,7 @@
IF (NOT ${PROJECT_NAME} STREQUAL "Mesquite")
@@ -758,7 +758,7 @@
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
++++ trilinos-10.4.0-Source/packages/ml/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -305,7 +305,7 @@
#
@@ -770,7 +770,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/moertel/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -95,7 +95,7 @@
#
@@ -782,7 +782,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/moocho/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -198,7 +198,7 @@
#
@@ -794,7 +794,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -60,7 +60,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST( ThyraDiagonalQuadraticResponseOnlyOpt
SOURCES
@@ -806,7 +806,7 @@
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
++++ trilinos-10.4.0-Source/packages/moocho/thyra/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -21,8 +21,8 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
@@ -820,7 +820,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/nox/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -210,7 +210,7 @@
#
@@ -832,7 +832,7 @@
SOURCES ${SOURCES}
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
++++ trilinos-10.4.0-Source/packages/nox/src-belos/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -23,7 +23,7 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_BELOS)
@@ -844,7 +844,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/nox/src-epetra/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -62,9 +62,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA)
@@ -859,7 +859,7 @@
ENDIF()
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
++++ trilinos-10.4.0-Source/packages/nox/src-lapack/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -22,9 +22,9 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK)
@@ -874,7 +874,7 @@
ENDIF()
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
++++ trilinos-10.4.0-Source/packages/nox/src-loca/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -351,10 +351,10 @@
IF (NOX_ENABLE_LOCA)
@@ -890,7 +890,7 @@
ENDIF()
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
++++ trilinos-10.4.0-Source/packages/nox/src-loca/src-epetra/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -81,9 +81,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
@@ -905,7 +905,7 @@
ENDIF()
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
++++ trilinos-10.4.0-Source/packages/nox/src-loca/src-lapack/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -24,9 +24,9 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA)
@@ -920,7 +920,7 @@
ENDIF()
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
++++ trilinos-10.4.0-Source/packages/nox/src-loca/src-mf/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -22,7 +22,7 @@
IF (NOX_ENABLE_LOCA AND NOX_ENABLE_MF)
@@ -932,7 +932,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/nox/src-loca/src-thyra/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -19,9 +19,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA AND NOX_ENABLE_LOCA)
@@ -947,7 +947,7 @@
ENDIF()
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
++++ trilinos-10.4.0-Source/packages/nox/src-petsc/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -25,9 +25,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_PETSC)
@@ -964,7 +964,7 @@
+ENDIF()
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
++++ trilinos-10.4.0-Source/packages/nox/src-thyra/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -24,9 +24,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA)
@@ -981,7 +981,7 @@
+ENDIF()
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
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -16,7 +16,7 @@
Problem_Interface.C
brussCont.C
@@ -1002,7 +1002,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -17,7 +17,7 @@
brussXYZT_ifpack.C
COMM serial mpi
@@ -1086,7 +1086,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -13,7 +13,7 @@
multipointTcubed.C
COMM mpi
@@ -1098,7 +1098,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -11,7 +11,7 @@
Pitchfork.C
COMM serial mpi
@@ -1110,7 +1110,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -11,7 +11,7 @@
Tcubed.C
COMM serial mpi
@@ -1140,7 +1140,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
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -28,11 +28,11 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
@@ -1157,7 +1157,7 @@
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
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -11,7 +11,7 @@
HouseholderBorderedSolve.C
COMM serial mpi
@@ -1214,7 +1214,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -13,7 +13,7 @@
test.C
Laplace2D.C
@@ -1235,7 +1235,7 @@
PASS_REGULAR_EXPRESSION "Test passed!"
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
++++ trilinos-10.4.0-Source/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Epetra_Vector
@@ -1256,7 +1256,7 @@
PASS_REGULAR_EXPRESSION "Test passed!"
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
++++ trilinos-10.4.0-Source/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -10,7 +10,7 @@
SOURCES ChanContinuation.C
COMM serial mpi
@@ -1286,7 +1286,7 @@
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
++++ trilinos-10.4.0-Source/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -21,7 +21,7 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA)
@@ -1298,7 +1298,7 @@
TESTONLY
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
++++ trilinos-10.4.0-Source/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -10,7 +10,7 @@
SOURCES BorderedSolve.C
COMM serial mpi
@@ -1337,7 +1337,7 @@
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
++++ trilinos-10.4.0-Source/packages/nox/test/lapack/NOX/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
rosenbrock
@@ -1358,7 +1358,7 @@
PASS_REGULAR_EXPRESSION "Test passed!"
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
++++ trilinos-10.4.0-Source/packages/nox/test/lapack/StatusTests/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
StatusTests
@@ -1370,7 +1370,7 @@
PASS_REGULAR_EXPRESSION "Test passed!"
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
++++ trilinos-10.4.0-Source/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
UserDefinedObjects
@@ -1382,7 +1382,7 @@
PASS_REGULAR_EXPRESSION "Test passed!"
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
++++ trilinos-10.4.0-Source/packages/nox/test/utils/CMakeLists.txt 2010-08-14 15:36:45.000000000 +0200
@@ -4,7 +4,7 @@
SET(HEADERS "")
@@ -1392,7 +1392,12 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-@@ -26,7 +26,7 @@
+@@ -22,11 +22,11 @@
+ IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_EpetraExt)
+ APPEND_SET(HEADERS NOX_Epetra_DebugTools.H)
+ APPEND_SET(SOURCES NOX_Epetra_DebugTools.C)
+- APPEND_SET(TESTUTILS_DEPLIBS noxepetra)
++ APPEND_SET(TESTUTILS_DEPLIBS trilinos_noxepetra)
ENDIF()
PACKAGE_ADD_LIBRARY(
@@ -1403,7 +1408,7 @@
TESTONLY
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
++++ trilinos-10.4.0-Source/packages/optika/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -27,10 +27,10 @@
@@ -1419,7 +1424,7 @@
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
++++ trilinos-10.4.0-Source/packages/optipack/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -29,7 +29,7 @@
#
@@ -1431,7 +1436,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/optipack/test/NonlinearCG/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -6,7 +6,7 @@
SOURCES
NonlinearCG_UnitTests.cpp
@@ -1443,7 +1448,7 @@
" " # 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
++++ trilinos-10.4.0-Source/packages/pamgen/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -208,13 +208,13 @@
#
@@ -1462,7 +1467,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/phalanx/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -90,7 +90,7 @@
#
@@ -1474,7 +1479,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/phalanx/test/DataContainer/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -8,8 +8,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
data_container
@@ -1489,7 +1494,7 @@
+ )
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
++++ trilinos-10.4.0-Source/packages/phalanx/test/EvaluatorManager/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
evaluator_manager
@@ -1501,7 +1506,7 @@
PASS_REGULAR_EXPRESSION "Test passed!"
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
++++ trilinos-10.4.0-Source/packages/phalanx/test/Field/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -9,7 +9,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
field
@@ -1556,7 +1561,7 @@
+#ENDIF(Phalanx_ENABLE_Intrepid)
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
++++ trilinos-10.4.0-Source/packages/phalanx/test/FieldTag/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
field_tag
@@ -1568,7 +1573,7 @@
PASS_REGULAR_EXPRESSION "Test passed!"
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
++++ trilinos-10.4.0-Source/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -13,10 +13,10 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
intrepid_interoperability
@@ -1585,7 +1590,7 @@
+ENDIF(Phalanx_ENABLE_Intrepid)
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
++++ trilinos-10.4.0-Source/packages/phalanx/test/Performance/Allocators/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -8,8 +8,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
performance_allocators
@@ -1600,7 +1605,7 @@
+ )
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
++++ trilinos-10.4.0-Source/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -6,8 +6,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
performance_bracket_operator
@@ -1615,7 +1620,7 @@
+ )
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
++++ trilinos-10.4.0-Source/packages/phalanx/test/Utilities/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -32,7 +32,7 @@
)
@@ -1639,7 +1644,7 @@
+ )
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
++++ trilinos-10.4.0-Source/packages/piro/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -71,7 +71,7 @@
#
@@ -1651,7 +1656,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/pliris/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -145,7 +145,7 @@
MESSAGE(" Building the Z Complex library")
ADD_DEFINITIONS(-DZCPLX)
@@ -1690,7 +1695,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/PyTrilinos/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -179,12 +179,12 @@
#
@@ -1717,7 +1722,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
++++ trilinos-10.4.0-Source/packages/rtop/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -77,7 +77,7 @@
#
@@ -1729,7 +1734,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/rythmos/adapters/gaasp/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -31,10 +31,10 @@
#
@@ -1745,7 +1750,7 @@
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
++++ trilinos-10.4.0-Source/packages/rythmos/adapters/gaasp/test/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_gaasp_adapters
@@ -1757,7 +1762,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -27,7 +27,7 @@
#
@@ -1769,7 +1774,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/rythmos/example/diagonalTransient/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
diagonalTransient
@@ -1781,7 +1786,7 @@
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
++++ trilinos-10.4.0-Source/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
1DfemTransient
@@ -1793,7 +1798,7 @@
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
++++ trilinos-10.4.0-Source/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
timeDiscretizedBackwardEuler
@@ -1805,7 +1810,7 @@
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
++++ trilinos-10.4.0-Source/packages/rythmos/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -31,7 +31,7 @@
#
@@ -1831,7 +1836,7 @@
ENDIF()
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
++++ trilinos-10.4.0-Source/packages/rythmos/test/Charon/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -9,7 +9,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
CharonRythmos_UnitTest
@@ -1843,7 +1848,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/rythmos/test/ConvergenceTest/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -23,7 +23,7 @@
SOURCES
${COMMON_SOURCES}
@@ -1855,7 +1860,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
vdp
@@ -1867,7 +1872,7 @@
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
++++ trilinos-10.4.0-Source/packages/rythmos/test/simpleAdjoint/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
simpleAdjoint
@@ -1879,7 +1884,7 @@
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
++++ trilinos-10.4.0-Source/packages/rythmos/test/ThetaStepper/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ThetaStepper_UnitTest
@@ -1891,7 +1896,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/rythmos/test/UnitTest/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -15,7 +15,7 @@
#PACKAGE_ADD_EXECUTABLE_AND_TEST(
# UnitTest
@@ -2200,7 +2205,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
++++ trilinos-10.4.0-Source/packages/sacado/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -252,7 +252,7 @@
#
@@ -2212,7 +2217,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/sacado/test/utils/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -35,9 +35,9 @@
#
@@ -2227,7 +2232,7 @@
# )
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
++++ trilinos-10.4.0-Source/packages/shards/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -49,7 +49,7 @@
#
@@ -2239,7 +2244,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
++++ trilinos-10.4.0-Source/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -39,7 +39,7 @@
#
@@ -2251,7 +2256,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -48,7 +48,7 @@
#
@@ -2263,7 +2268,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -38,7 +38,7 @@
#
@@ -2275,7 +2280,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/stk/stk_search/stk_search/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -54,7 +54,7 @@
#
@@ -2287,7 +2292,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -55,7 +55,7 @@
#
@@ -2299,7 +2304,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -63,7 +63,7 @@
#
@@ -2311,7 +2316,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -55,7 +55,7 @@
#
@@ -2323,7 +2328,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -43,7 +43,7 @@
#
@@ -2335,7 +2340,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -41,7 +41,7 @@
#
@@ -2347,7 +2352,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/stokhos/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -161,7 +161,7 @@
#
@@ -2359,7 +2364,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/stratimikos/adapters/amesos/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -16,7 +16,7 @@
)
@@ -2371,7 +2376,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -16,7 +16,7 @@
)
@@ -2383,7 +2388,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
++++ trilinos-10.4.0-Source/packages/stratimikos/adapters/belos/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -20,7 +20,7 @@
)
@@ -2395,7 +2400,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -12,7 +12,7 @@
)
@@ -2407,7 +2412,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/stratimikos/adapters/ml/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -12,7 +12,7 @@
)
@@ -2419,7 +2424,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/stratimikos/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -45,33 +45,33 @@
ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
@@ -2462,7 +2467,7 @@
DEPLIBS ${DEPLIBS}
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
++++ trilinos-10.4.0-Source/packages/Sundance/src-core/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -373,7 +373,7 @@
#
@@ -2474,7 +2479,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/Sundance/src-interop/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -50,7 +50,7 @@
#
@@ -2486,7 +2491,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
++++ trilinos-10.4.0-Source/packages/Sundance/src-solvers/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -353,7 +353,7 @@
#
@@ -2498,7 +2503,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
++++ trilinos-10.4.0-Source/packages/Sundance/src-std-framework/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -331,7 +331,7 @@
#
@@ -2510,7 +2515,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
++++ trilinos-10.4.0-Source/packages/Sundance/src-std-mesh/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -317,7 +317,7 @@
#
@@ -2522,7 +2527,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/Sundance/src-utils/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -94,7 +94,7 @@
#
@@ -2534,7 +2539,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
++++ trilinos-10.4.0-Source/packages/teuchos/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -298,7 +298,7 @@
#
@@ -2546,7 +2551,7 @@
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
++++ trilinos-10.4.0-Source/packages/teuchos/test/FancyOutputting/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -2,17 +2,17 @@
INCLUDE(PackageAddExecutableAndTest)
@@ -2570,7 +2575,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/ThreadPool/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -64,7 +64,7 @@
#
@@ -2582,7 +2587,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/thyra/adapters/epetra/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -10,8 +10,8 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
@@ -2596,7 +2601,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/thyra/adapters/epetraext/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -13,8 +13,8 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
@@ -2610,7 +2615,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
++++ trilinos-10.4.0-Source/packages/thyra/adapters/tpetra/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -12,14 +12,14 @@
ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Epetra)
@@ -2631,7 +2636,7 @@
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
++++ trilinos-10.4.0-Source/packages/thyra/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -86,7 +86,7 @@
#
@@ -2643,7 +2648,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/thyra/test/nonlinear/models/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -13,10 +13,10 @@
APPEND_GLOB(HEADERS ${DIR}/*.hpp)
@@ -2659,7 +2664,7 @@
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
++++ trilinos-10.4.0-Source/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -6,7 +6,7 @@
SOURCES
Simple2DModelEvaluator_UnitTests.cpp
@@ -2680,7 +2685,7 @@
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
++++ trilinos-10.4.0-Source/packages/tifpack/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -72,7 +72,7 @@
#
@@ -2692,7 +2697,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/tifpack/test/belos/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -25,14 +25,14 @@
PACKAGE_ADD_EXECUTABLE(
tif_belos
@@ -2712,7 +2717,7 @@
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
++++ trilinos-10.4.0-Source/packages/tifpack/test/unit_tests/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -40,6 +40,6 @@
ARGS ""
COMM serial mpi
@@ -2723,8 +2728,8 @@
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 @@
++++ trilinos-10.4.0-Source/packages/tpetra/inout/CMakeLists.txt 2010-08-14 15:33:36.000000000 +0200
+@@ -41,10 +41,10 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2732,10 +2737,14 @@
+ trilinos_tpetrainout
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- DEPLIBS tpetra
+- DEPLIBS tpetra
++ DEPLIBS trilinos_tpetra
+ )
+
+ # PACKAGE_ADD_TEST_DIRECTORIES(test)
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
++++ trilinos-10.4.0-Source/packages/tpetra/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -33,7 +33,7 @@
#
@@ -2747,7 +2756,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/tpetra/test/BasicPerfTest/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -20,7 +20,7 @@
# ARGS
COMM mpi # serial
@@ -2759,7 +2768,7 @@
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
++++ trilinos-10.4.0-Source/packages/tpetra/test/BlockMultiVector/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -9,5 +9,5 @@
${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
COMM serial mpi
@@ -2769,7 +2778,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/tpetra/test/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -18,9 +18,9 @@
)
@@ -2784,7 +2793,7 @@
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
++++ trilinos-10.4.0-Source/packages/tpetra/test/CrsMatrix/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -17,7 +17,7 @@
ARGS ${ARGS}
COMM serial mpi
@@ -2805,7 +2814,7 @@
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
++++ trilinos-10.4.0-Source/packages/tpetra/test/MultiVector/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -9,5 +9,5 @@
${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
COMM serial mpi
@@ -2815,7 +2824,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/tpetra/test/VbrMatrix/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -14,7 +14,7 @@
SOURCES
VbrMatrix_UnitTests
@@ -2827,7 +2836,7 @@
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
++++ trilinos-10.4.0-Source/packages/TriKota/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -164,7 +164,7 @@
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
@@ -2839,7 +2848,7 @@
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
++++ trilinos-10.4.0-Source/packages/trilinoscouplings/examples/scaling/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -8,21 +8,21 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_Poisson
@@ -2867,7 +2876,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/trilinoscouplings/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -153,7 +153,7 @@
#
@@ -2879,7 +2888,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/triutils/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -78,7 +78,7 @@
#
@@ -2891,7 +2900,7 @@
)
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
++++ trilinos-10.4.0-Source/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -466,7 +466,7 @@
#
@@ -2903,7 +2912,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
++++ trilinos-10.4.0-Source/packages/zoltan/src/CMakeLists.txt 2010-08-14 15:28:02.000000000 +0200
@@ -764,11 +764,11 @@
#
More information about the debian-science-commits
mailing list