r38320 - in /packages/trilinos/trunk/debian: changelog control patches/libname.patch patches/soname.patch patches/trilinosversion.patch
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Wed Apr 6 14:52:14 UTC 2011
Author: trophime-guest
Date: Wed Apr 6 14:52:07 2011
New Revision: 38320
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38320
Log:
update to 10.6.1
Modified:
packages/trilinos/trunk/debian/changelog
packages/trilinos/trunk/debian/control
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=38320&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/changelog (original)
+++ packages/trilinos/trunk/debian/changelog Wed Apr 6 14:52:07 2011
@@ -1,3 +1,10 @@
+trilinos (10.6.1.dfsg-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * New upstream release
+
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Wed, 06 Apr 2011 13:46:05 +0200
+
trilinos (10.4.0.dfsg-1) unstable; urgency=low
[Christophe Prud'homme]
Modified: packages/trilinos/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/control?rev=38320&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/control (original)
+++ packages/trilinos/trunk/debian/control Wed Apr 6 14:52:07 2011
@@ -3,7 +3,9 @@
Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: cdbs, quilt, debhelper (>= 7), cmake, gfortran, libopenmpi-dev, libsuperlu3-dev, libsuitesparse-dev, python-dev, swig1.3, python-numpy, libexpat1-dev, libxml2-dev, python-central
+Build-Depends: cdbs, quilt, debhelper (>= 7), cmake, gfortran,
+ libopenmpi-dev, libsuperlu3-dev, libsuitesparse-dev, python-dev,
+ swig1.3, python-numpy, libexpat1-dev, libxml2-dev, python-central
Standards-Version: 3.9.1
XS-Python-Version: >= 2.5
Homepage: http://trilinos.sandia.gov/
Modified: packages/trilinos/trunk/debian/patches/libname.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/libname.patch?rev=38320&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/libname.patch (original)
+++ packages/trilinos/trunk/debian/patches/libname.patch Wed Apr 6 14:52:07 2011
@@ -1,6 +1,7 @@
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/amesos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/amesos/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/amesos/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -465,7 +465,7 @@
#
@@ -10,9 +11,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/anasazi/epetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/anasazi/epetra/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/anasazi/epetra/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -45,9 +45,9 @@
#
@@ -25,9 +27,10 @@
+ DEPLIBS trilinos_anasazi
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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -62,9 +62,9 @@
#
@@ -40,10 +43,11 @@
+ DEPLIBS trilinos_anasazi
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-14 15:28:01.000000000 +0200
-@@ -142,7 +142,7 @@
+Index: trilinos-10.6.1.dfsg/packages/anasazi/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/anasazi/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/anasazi/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -406,7 +406,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -52,9 +56,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/anasazi/thyra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/anasazi/thyra/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/anasazi/thyra/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -111,7 +111,7 @@
#
@@ -64,9 +69,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/aztecoo/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/aztecoo/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/aztecoo/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -173,7 +173,7 @@
#
@@ -76,9 +82,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/belos/epetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/belos/epetra/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/belos/epetra/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -39,8 +39,8 @@
#
@@ -90,9 +97,10 @@
- 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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/belos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/belos/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/belos/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -103,7 +103,7 @@
#
@@ -102,9 +110,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/belos/tpetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/belos/tpetra/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/belos/tpetra/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -37,8 +37,8 @@
#
@@ -116,10 +125,11 @@
- 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-14 15:28:01.000000000 +0200
-@@ -109,7 +109,7 @@
+Index: trilinos-10.6.1.dfsg/packages/CTrilinos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/CTrilinos/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/CTrilinos/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -110,7 +110,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -128,9 +138,10 @@
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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/epetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/epetra/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/epetra/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -225,7 +225,7 @@
#
@@ -140,9 +151,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/epetraext/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/epetraext/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/epetraext/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -432,7 +432,7 @@
#
@@ -152,9 +164,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/fei/base/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/fei/base/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/fei/base/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -241,7 +241,7 @@
#
@@ -164,10 +177,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:01.000000000 +0200
-@@ -75,7 +75,7 @@
+Index: trilinos-10.6.1.dfsg/packages/fei/support-Trilinos/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/fei/support-Trilinos/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/fei/support-Trilinos/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -75,8 +75,8 @@
#
PACKAGE_ADD_LIBRARY(
@@ -175,11 +189,14 @@
+ trilinos_fei_trilinos
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- )
-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-14 15:28:01.000000000 +0200
-@@ -135,7 +135,7 @@
+- DEPLIBS fei_base
++ DEPLIBS trilinos_fei_base
+ )
+Index: trilinos-10.6.1.dfsg/packages/fei/test_utils/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/fei/test_utils/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/fei/test_utils/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -135,8 +135,8 @@
#
PACKAGE_ADD_LIBRARY(
@@ -187,10 +204,13 @@
+ trilinos_fei_test_utils
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- )
-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-14 15:28:01.000000000 +0200
+- DEPLIBS fei_base fei_trilinos
++ DEPLIBS trilinos_fei_base trilinos_fei_trilinos
+ )
+Index: trilinos-10.6.1.dfsg/packages/galeri/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/galeri/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/galeri/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -146,7 +146,7 @@
#
@@ -200,9 +220,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/globipack/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/globipack/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/globipack/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -29,7 +29,7 @@
#
@@ -212,9 +233,10 @@
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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/globipack/test/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/globipack/test/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/globipack/test/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -22,7 +22,7 @@
SOURCES
ArmijoPolyInterpLineSearch_UnitTests.cpp
@@ -251,9 +273,10 @@
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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/globipack/test/meritfuncs/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/globipack/test/meritfuncs/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/globipack/test/meritfuncs/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -14,11 +14,11 @@
APPEND_GLOB(HEADERS ${DIR}/*.hpp)
@@ -268,9 +291,10 @@
)
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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -6,7 +6,7 @@
SOURCES
TestLagrPolyMeritFunc1D_UnitTests.cpp
@@ -280,9 +304,10 @@
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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/ifpack/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/ifpack/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/ifpack/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -232,7 +232,7 @@
#
@@ -292,9 +317,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/ifpack/test/AztecOO/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/ifpack/test/AztecOO/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/ifpack/test/AztecOO/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -17,7 +17,7 @@
PACKAGE_ADD_EXECUTABLE(
ifp_aztecoo
@@ -304,57 +330,158 @@
)
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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/intrepid/example/Drivers/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/intrepid/example/Drivers/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/intrepid/example/Drivers/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -4,7 +4,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- Example_01
- SOURCES example_01.cpp
-- DEPLIBS epetra epetraext
-+ DEPLIBS trilinos_epetra trilinos_epetraext
- ARGS "10 10 10 0 1.0 10.0 0.0 1.0 -1.0 1.0 -1.0 1.0"
- NUM_MPI_PROCS 1
- # PASS_REGULAR_EXPRESSION "TEST PASSED"
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_01
+ SOURCES example_01.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra epetraext
+ ARGS "10 10 10 0 1.0 10.0 0.0 1.0 -1.0 1.0 -1.0 1.0"
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "TEST PASSED"
@@ -13,7 +13,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- Example_02
- SOURCES example_02.cpp
-- DEPLIBS epetra epetraext
-+ DEPLIBS trilinos_epetra trilinos_epetraext
- ARGS "10 10 10 0 1.0 1.0 -1.0 1.0 -1.0 1.0 -1.0 1.0"
- NUM_MPI_PROCS 1
- # PASS_REGULAR_EXPRESSION "TEST PASSED"
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_02
+ SOURCES example_02.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "10 10 10 0 1.0 1.0 -1.0 1.0 -1.0 1.0 -1.0 1.0"
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "TEST PASSED"
@@ -22,7 +22,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- Example_03
- SOURCES example_03.cpp
-- DEPLIBS epetra epetraext
-+ DEPLIBS trilinos_epetra trilinos_epetraext
- ARGS "10 10 10"
- NUM_MPI_PROCS 1
- # PASS_REGULAR_EXPRESSION "TEST PASSED"
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_03
+ SOURCES example_03.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "10 10 10"
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "TEST PASSED"
@@ -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"
+ 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-14 15:28:01.000000000 +0200
+ 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"
+@@ -49,7 +49,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_06
+ SOURCES example_06.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "1 10 10"
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "TEST PASSED"
+@@ -58,7 +58,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_07
+ SOURCES example_07.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "1 10 10"
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "TEST PASSED"
+@@ -67,7 +67,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_08
+ SOURCES example_08.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "1 10 10"
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "TEST PASSED"
+@@ -76,7 +76,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_09
+ SOURCES example_09.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "1 10 10"
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "TEST PASSED"
+@@ -85,7 +85,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_10
+ SOURCES example_10.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "1 10 10 10"
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "TEST PASSED"
+@@ -94,7 +94,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_11
+ SOURCES example_11.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "1 10 10 10"
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "TEST PASSED"
+@@ -103,7 +103,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_12
+ SOURCES example_12.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "1 10 10 10"
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "TEST PASSED"
+@@ -112,7 +112,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_13
+ SOURCES example_13.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "1 10 10 10"
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "TEST PASSED"
+@@ -121,7 +121,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_14
+ SOURCES example_14.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "1 10 10 10"
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "TEST PASSED"
+@@ -130,7 +130,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_15
+ SOURCES example_15.cpp
+- DEPLIBS epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
+ ARGS "1 10 10 10"
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "TEST PASSED"
+@@ -139,7 +139,7 @@
+ # PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ # Example_16
+ # SOURCES example_16.cpp
+-# DEPLIBS epetra epetraext
++# DEPLIBS trilinos_epetra trilinos_epetraext
+ # ARGS "1 10 10 10"
+ # NUM_MPI_PROCS 1
+ # PASS_REGULAR_EXPRESSION "TEST PASSED"
+Index: trilinos-10.6.1.dfsg/packages/intrepid/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/intrepid/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/intrepid/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -199,7 +199,7 @@
#
@@ -364,9 +491,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/isorropia/example/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/isorropia/example/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/isorropia/example/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -8,6 +8,6 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
matrix_1
@@ -375,9 +503,10 @@
+ DEPLIBS trilinos_isorropia_test_utils
COMM serial mpi
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/isorropia/example/geometric/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/isorropia/example/geometric/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/isorropia/example/geometric/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
example_rcb
@@ -387,9 +516,10 @@
COMM serial mpi
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/isorropia/example/levelSchedule/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/isorropia/example/levelSchedule/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/isorropia/example/levelSchedule/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
levelSchedule
@@ -399,9 +529,10 @@
COMM serial
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/isorropia/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/isorropia/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/isorropia/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -173,7 +173,7 @@
#
@@ -411,9 +542,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/isorropia/test/geometric/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/isorropia/test/geometric/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/isorropia/test/geometric/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_geometric
@@ -423,9 +555,10 @@
COMM serial mpi
ARGS
"--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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/isorropia/test/levelsolver/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/isorropia/test/levelsolver/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/isorropia/test/levelsolver/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -7,7 +7,7 @@
COMM serial mpi
ARGS
@@ -435,9 +568,10 @@
)
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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/isorropia/test/mtx/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/isorropia/test/mtx/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/isorropia/test/mtx/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_balanced_copy
@@ -465,9 +599,10 @@
COMM serial mpi
ARGS
"--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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/isorropia/test/part_sizes/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/isorropia/test/part_sizes/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/isorropia/test/part_sizes/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
part_sizes
@@ -477,9 +612,10 @@
COMM serial mpi
ARGS
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/isorropia/test/probing/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/isorropia/test/probing/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/isorropia/test/probing/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -5,7 +5,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_probing
@@ -489,9 +625,10 @@
COMM serial mpi
ARGS
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/isorropia/utils/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/isorropia/utils/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/isorropia/utils/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -33,9 +33,9 @@
#
@@ -504,19 +641,20 @@
- DEPLIBS isorropia
+ DEPLIBS trilinos_isorropia
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/kokkos/LinAlg/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/kokkos/LinAlg/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/kokkos/LinAlg/CMakeLists.txt 2011-04-06 14:41:33.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)
+- CUDA_ADD_LIBRARY(kokkoslinalg_cuda Kokkos_DefaultArithmetic.cu
++ CUDA_ADD_LIBRARY(trilinos_kokkoslinalg_cuda Kokkos_DefaultArithmetic.cu
+ Kokkos_DefaultBlockSparseOps.cu Kokkos_DefaultSparseOps.cu Kokkos_DefaultRelaxation.cu)
APPEND_SET(KOKKOS_LINALG_CUDALIBS "kokkoslinalg_cuda")
ENDIF()
-
-@@ -73,10 +73,10 @@
+@@ -74,10 +74,10 @@
#
PACKAGE_ADD_LIBRARY(
@@ -528,10 +666,11 @@
+ DEPLIBS trilinos_kokkos trilinos_kokkosnodeapi ${KOKKOS_LINALG_CUDALIBS}
)
- 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-14 15:28:01.000000000 +0200
+ PACKAGE_ADD_TEST_DIRECTORIES(examples)
+Index: trilinos-10.6.1.dfsg/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -6,7 +6,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -548,9 +687,10 @@
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -6,7 +6,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -567,9 +707,10 @@
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -6,5 +6,5 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -577,9 +718,10 @@
- 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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -8,5 +8,5 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -587,9 +729,10 @@
- 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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/kokkos/NodeAPI/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/kokkos/NodeAPI/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/kokkos/NodeAPI/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -101,10 +101,10 @@
#
@@ -603,10 +746,11 @@
)
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-14 15:28:01.000000000 +0200
-@@ -15,7 +15,7 @@
+Index: trilinos-10.6.1.dfsg/packages/kokkos/NodeAPI/test/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/kokkos/NodeAPI/test/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/kokkos/NodeAPI/test/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -9,7 +9,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
@@ -615,16 +759,19 @@
)
PACKAGE_ADD_EXECUTABLE_AND_TEST(
-@@ -28,5 +28,5 @@
+@@ -21,7 +21,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
- DEPLIBS kokkosnodeapi
+ DEPLIBS trilinos_kokkosnodeapi
)
-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-14 15:28:01.000000000 +0200
+ SET(TIMING_INSTALLS Kokkos_SerialNodeTestAndTiming)
+
+Index: trilinos-10.6.1.dfsg/packages/kokkos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/kokkos/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/kokkos/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -44,7 +44,7 @@
#
@@ -634,9 +781,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:01.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/komplex/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/komplex/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/komplex/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -69,7 +69,7 @@
#
@@ -646,33 +794,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:01.000000000 +0200
-@@ -84,7 +84,7 @@
- #
-
- PACKAGE_ADD_LIBRARY(
-- meros
-+ trilinos_meros
- HEADERS ${HEADERS}
- SOURCES ${SOURCES}
- )
-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-14 15:28:02.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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/mesquite/itaps/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/mesquite/itaps/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/mesquite/itaps/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -9,7 +9,7 @@
SET(${PACKAGE_NAME}_ENABLE_IMESH ON)
MAKEFILE_VAL(${IMESH_DEFS} IMESH_LIBS IMESH_LIBS)
@@ -708,10 +833,11 @@
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-14 15:28:02.000000000 +0200
-@@ -936,7 +936,7 @@
+Index: trilinos-10.6.1.dfsg/packages/mesquite/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/mesquite/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/mesquite/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -944,7 +944,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -720,9 +846,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/mesquite/utils/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/mesquite/utils/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/mesquite/utils/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -35,7 +35,7 @@
IF (NOT ${PROJECT_NAME} STREQUAL "Mesquite")
@@ -756,9 +883,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/ml/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/ml/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/ml/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -305,7 +305,7 @@
#
@@ -768,10 +896,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
-@@ -95,7 +95,7 @@
+Index: trilinos-10.6.1.dfsg/packages/moertel/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/moertel/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/moertel/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -96,7 +96,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -780,9 +909,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/moocho/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/moocho/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/moocho/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -198,7 +198,7 @@
#
@@ -792,9 +922,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -60,7 +60,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST( ThyraDiagonalQuadraticResponseOnlyOpt
SOURCES
@@ -804,9 +935,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/moocho/thyra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/moocho/thyra/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/moocho/thyra/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -21,8 +21,8 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
@@ -818,9 +950,10 @@
- DEPLIBS moocho
+ DEPLIBS trilinos_moocho
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -210,7 +210,7 @@
#
@@ -830,9 +963,10 @@
HEADERS ${HEADERS}
NOINSTALLHEADERS ${NOINSTALLHEADERS}
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/src-belos/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/src-belos/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/src-belos/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -23,7 +23,7 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_BELOS)
@@ -842,9 +976,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/src-epetra/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/src-epetra/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/src-epetra/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -62,9 +62,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA)
@@ -857,9 +992,10 @@
+ DEPLIBS trilinos_nox
)
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/src-lapack/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/src-lapack/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/src-lapack/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -22,9 +22,9 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK)
@@ -872,9 +1008,10 @@
+ DEPLIBS trilinos_nox
)
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/src-loca/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/src-loca/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/src-loca/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -351,10 +351,10 @@
IF (NOX_ENABLE_LOCA)
@@ -888,9 +1025,10 @@
+ DEPLIBS trilinos_nox
)
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/src-loca/src-epetra/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/src-loca/src-epetra/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/src-loca/src-epetra/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -81,9 +81,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
@@ -903,9 +1041,10 @@
+ DEPLIBS trilinos_loca trilinos_noxepetra trilinos_nox
)
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/src-loca/src-lapack/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/src-loca/src-lapack/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/src-loca/src-lapack/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -24,9 +24,9 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA)
@@ -918,9 +1057,10 @@
+ DEPLIBS trilinos_loca trilinos_noxlapack trilinos_nox
)
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/src-loca/src-mf/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/src-loca/src-mf/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/src-loca/src-mf/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -22,7 +22,7 @@
IF (NOX_ENABLE_LOCA AND NOX_ENABLE_MF)
@@ -930,9 +1070,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/src-loca/src-thyra/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/src-loca/src-thyra/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/src-loca/src-thyra/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -19,9 +19,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA AND NOX_ENABLE_LOCA)
@@ -945,9 +1086,10 @@
+ DEPLIBS trilinos_loca trilinos_noxthyra trilinos_nox
)
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/src-petsc/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/src-petsc/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/src-petsc/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -25,9 +25,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_PETSC)
@@ -962,9 +1104,10 @@
-ENDIF()
\ No newline at end of file
+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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/src-thyra/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/src-thyra/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/src-thyra/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -24,9 +24,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA)
@@ -979,9 +1122,10 @@
-ENDIF()
\ No newline at end of file
+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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -16,7 +16,7 @@
Problem_Interface.C
brussCont.C
@@ -1000,9 +1144,10 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -17,7 +17,7 @@
brussXYZT_ifpack.C
COMM serial mpi
@@ -1084,9 +1229,10 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -13,7 +13,7 @@
multipointTcubed.C
COMM mpi
@@ -1096,9 +1242,10 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -11,7 +11,7 @@
Pitchfork.C
COMM serial mpi
@@ -1108,9 +1255,10 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -11,7 +11,7 @@
Tcubed.C
COMM serial mpi
@@ -1138,9 +1286,10 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -28,11 +28,11 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
@@ -1155,9 +1304,10 @@
)
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -11,7 +11,7 @@
HouseholderBorderedSolve.C
COMM serial mpi
@@ -1212,9 +1362,10 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -13,7 +13,7 @@
test.C
Laplace2D.C
@@ -1233,9 +1384,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Epetra_Vector
@@ -1254,9 +1406,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -10,7 +10,7 @@
SOURCES ChanContinuation.C
COMM serial mpi
@@ -1284,9 +1437,10 @@
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -21,7 +21,7 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA)
@@ -1296,9 +1450,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -10,7 +10,7 @@
SOURCES BorderedSolve.C
COMM serial mpi
@@ -1335,9 +1490,10 @@
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/lapack/NOX/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/lapack/NOX/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/lapack/NOX/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
rosenbrock
@@ -1356,9 +1512,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/lapack/StatusTests/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/lapack/StatusTests/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/lapack/StatusTests/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
StatusTests
@@ -1368,9 +1525,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
UserDefinedObjects
@@ -1380,9 +1538,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
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-14 15:36:45.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/nox/test/utils/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/nox/test/utils/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/nox/test/utils/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -4,7 +4,7 @@
SET(HEADERS "")
@@ -1406,15 +1565,16 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/optika/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/optika/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/optika/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -27,10 +27,10 @@
PACKAGE_ADD_LIBRARY(
- optika
-+ trilinos_optika
++ trilinos_optika
HEADERS ${MOC_HDRS} ${HDRS}
SOURCES ${SRCS} ${MOC_SRCS}
DEPLIBS
@@ -1422,9 +1582,10 @@
+ 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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/optipack/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/optipack/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/optipack/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -29,7 +29,7 @@
#
@@ -1434,9 +1595,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/optipack/test/NonlinearCG/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/optipack/test/NonlinearCG/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/optipack/test/NonlinearCG/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -6,7 +6,7 @@
SOURCES
NonlinearCG_UnitTests.cpp
@@ -1446,9 +1608,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/pamgen/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/pamgen/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/pamgen/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -208,13 +208,13 @@
#
@@ -1465,21 +1628,23 @@
HEADERS ${PE_HEADERS}
SOURCES ${PE_SOURCES}
)
-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-14 15:28:02.000000000 +0200
-@@ -90,7 +90,7 @@
- #
+Index: trilinos-10.6.1.dfsg/packages/phalanx/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/phalanx/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/phalanx/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -99,7 +99,7 @@
+ ENDIF(Phalanx_ENABLE_GPU)
PACKAGE_ADD_LIBRARY(
- phalanx
+ trilinos_phalanx
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- )
-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-14 15:28:02.000000000 +0200
+ DEPLIBS ${Phalanx_GPU_LIBRARY}
+Index: trilinos-10.6.1.dfsg/packages/phalanx/test/DataContainer/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/phalanx/test/DataContainer/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/phalanx/test/DataContainer/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -8,8 +8,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
data_container
@@ -1492,9 +1657,10 @@
- )
\ No newline at end of file
+ )
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/phalanx/test/EvaluatorManager/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/phalanx/test/EvaluatorManager/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/phalanx/test/EvaluatorManager/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
evaluator_manager
@@ -1504,9 +1670,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/phalanx/test/Field/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/phalanx/test/Field/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/phalanx/test/Field/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -9,7 +9,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
field
@@ -1559,9 +1726,10 @@
-#ENDIF(Phalanx_ENABLE_Intrepid)
\ No newline at end of file
+#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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/phalanx/test/FieldTag/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/phalanx/test/FieldTag/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/phalanx/test/FieldTag/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
field_tag
@@ -1571,9 +1739,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -13,10 +13,10 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
intrepid_interoperability
@@ -1588,9 +1757,10 @@
-ENDIF(Phalanx_ENABLE_Intrepid)
\ No newline at end of file
+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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/phalanx/test/Performance/Allocators/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/phalanx/test/Performance/Allocators/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/phalanx/test/Performance/Allocators/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -8,8 +8,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
performance_allocators
@@ -1603,9 +1773,10 @@
- )
\ No newline at end of file
+ )
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -6,8 +6,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
performance_bracket_operator
@@ -1618,9 +1789,10 @@
- )
\ No newline at end of file
+ )
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/phalanx/test/Utilities/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/phalanx/test/Utilities/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/phalanx/test/Utilities/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -32,7 +32,7 @@
)
@@ -1642,9 +1814,10 @@
- )
\ No newline at end of file
+ )
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/piro/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/piro/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/piro/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -71,7 +71,7 @@
#
@@ -1654,9 +1827,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/pliris/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/pliris/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/pliris/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -145,7 +145,7 @@
MESSAGE(" Building the Z Complex library")
ADD_DEFINITIONS(-DZCPLX)
@@ -1693,9 +1867,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/PyTrilinos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/PyTrilinos/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/PyTrilinos/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -179,12 +179,12 @@
#
@@ -1720,9 +1895,10 @@
# Add the header file to the list of additional "make clean" files
LIST(APPEND ADDITIONAL_CLEAN_FILES "${MODULE}PYTHON_wrap.h")
#
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/rtop/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/rtop/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/rtop/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -77,7 +77,7 @@
#
@@ -1732,9 +1908,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/rythmos/adapters/gaasp/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/rythmos/adapters/gaasp/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/rythmos/adapters/gaasp/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -31,10 +31,10 @@
#
@@ -1748,21 +1925,23 @@
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/rythmos/adapters/gaasp/test/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/rythmos/adapters/gaasp/test/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/rythmos/adapters/gaasp/test/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_gaasp_adapters
SOURCES ${SOURCES}
- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
COMM serial
STANDARD_PASS_OUTPUT
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -27,7 +27,7 @@
#
@@ -1772,9 +1951,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/rythmos/example/diagonalTransient/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/rythmos/example/diagonalTransient/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/rythmos/example/diagonalTransient/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
diagonalTransient
@@ -1784,9 +1964,10 @@
COMM serial mpi
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
1DfemTransient
@@ -1796,9 +1977,10 @@
COMM serial mpi
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
timeDiscretizedBackwardEuler
@@ -1808,9 +1990,10 @@
COMM serial mpi
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/rythmos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/rythmos/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/rythmos/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -31,7 +31,7 @@
#
@@ -1834,9 +2017,10 @@
)
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/rythmos/test/Charon/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/rythmos/test/Charon/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/rythmos/test/Charon/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -9,7 +9,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
CharonRythmos_UnitTest
@@ -1846,9 +2030,10 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/rythmos/test/ConvergenceTest/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/rythmos/test/ConvergenceTest/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/rythmos/test/ConvergenceTest/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -23,7 +23,7 @@
SOURCES
${COMMON_SOURCES}
@@ -1858,9 +2043,10 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
vdp
@@ -1870,9 +2056,10 @@
COMM serial mpi
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/rythmos/test/simpleAdjoint/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/rythmos/test/simpleAdjoint/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/rythmos/test/simpleAdjoint/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
simpleAdjoint
@@ -1882,9 +2069,10 @@
COMM serial mpi
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/rythmos/test/ThetaStepper/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/rythmos/test/ThetaStepper/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/rythmos/test/ThetaStepper/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ThetaStepper_UnitTest
@@ -1894,9 +2082,10 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/rythmos/test/UnitTest/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/rythmos/test/UnitTest/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/rythmos/test/UnitTest/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -15,7 +15,7 @@
#PACKAGE_ADD_EXECUTABLE_AND_TEST(
# UnitTest
@@ -2203,9 +2392,10 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/sacado/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/sacado/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/sacado/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -252,7 +252,7 @@
#
@@ -2215,9 +2405,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/sacado/test/utils/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/sacado/test/utils/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/sacado/test/utils/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -35,9 +35,9 @@
#
@@ -2230,9 +2421,10 @@
+# DEPLIBS trilinos_sacado
# TESTONLY
# )
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/shards/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/shards/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/shards/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -49,7 +49,7 @@
#
@@ -2242,9 +2434,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -39,7 +39,7 @@
#
@@ -2254,9 +2447,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -48,7 +48,7 @@
#
@@ -2266,21 +2460,23 @@
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-14 15:28:02.000000000 +0200
-@@ -38,7 +38,7 @@
+Index: trilinos-10.6.1.dfsg/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -42,7 +42,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-14 15:28:02.000000000 +0200
+ NOINSTALLHEADERS ${HEADERS} ${HEADERS_IMPL}
+ SOURCES ${SOURCES} ${SOURCES_IMPL}
+ )
+Index: trilinos-10.6.1.dfsg/packages/stk/stk_search/stk_search/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stk/stk_search/stk_search/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stk/stk_search/stk_search/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -54,7 +54,7 @@
#
@@ -2290,9 +2486,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -55,7 +55,7 @@
#
@@ -2302,9 +2499,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -63,7 +63,7 @@
#
@@ -2314,9 +2512,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -55,7 +55,7 @@
#
@@ -2326,9 +2525,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -43,7 +43,7 @@
#
@@ -2338,9 +2538,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/stk/stk_util/stk_util/util/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -41,7 +41,7 @@
#
@@ -2350,9 +2551,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/stokhos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stokhos/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stokhos/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -161,7 +161,7 @@
#
@@ -2362,9 +2564,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/stratimikos/adapters/amesos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stratimikos/adapters/amesos/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stratimikos/adapters/amesos/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -16,7 +16,7 @@
)
@@ -2374,9 +2577,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -16,7 +16,7 @@
)
@@ -2386,11 +2590,12 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
-@@ -20,7 +20,7 @@
- )
+Index: trilinos-10.6.1.dfsg/packages/stratimikos/adapters/belos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stratimikos/adapters/belos/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stratimikos/adapters/belos/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -11,7 +11,7 @@
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
PACKAGE_ADD_LIBRARY(
- stratimikosbelos
@@ -2398,9 +2603,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -12,7 +12,7 @@
)
@@ -2410,9 +2616,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/stratimikos/adapters/ml/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stratimikos/adapters/ml/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stratimikos/adapters/ml/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -12,7 +12,7 @@
)
@@ -2422,9 +2629,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/stratimikos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/stratimikos/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/stratimikos/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -45,33 +45,33 @@
ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
@@ -2465,10 +2673,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
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-14 15:28:02.000000000 +0200
-@@ -373,7 +373,7 @@
+Index: trilinos-10.6.1.dfsg/packages/Sundance/src-core/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/Sundance/src-core/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/Sundance/src-core/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -381,7 +381,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2476,10 +2685,11 @@
+ trilinos_sundanceCore
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- )
-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-14 15:28:02.000000000 +0200
+ DEPLIBS sundanceUtils sundanceInterop
+Index: trilinos-10.6.1.dfsg/packages/Sundance/src-interop/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/Sundance/src-interop/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/Sundance/src-interop/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -50,7 +50,7 @@
#
@@ -2488,11 +2698,12 @@
+ trilinos_sundanceInterop
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- )
-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-14 15:28:02.000000000 +0200
-@@ -353,7 +353,7 @@
+ DEPLIBS sundanceUtils
+Index: trilinos-10.6.1.dfsg/packages/Sundance/src-solvers/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/Sundance/src-solvers/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/Sundance/src-solvers/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -356,7 +356,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2500,11 +2711,12 @@
+ trilinos_TSFExtended
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- )
-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-14 15:28:02.000000000 +0200
-@@ -331,7 +331,7 @@
+ DEPLIBS sundanceUtils
+Index: trilinos-10.6.1.dfsg/packages/Sundance/src-std-framework/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/Sundance/src-std-framework/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/Sundance/src-std-framework/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -339,7 +339,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2512,11 +2724,12 @@
+ trilinos_sundanceStdFwk
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- )
-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-14 15:28:02.000000000 +0200
-@@ -317,7 +317,7 @@
+ DEPLIBS sundanceCore sundanceStdMesh TSFExtended sundanceInterop sundanceUtils
+Index: trilinos-10.6.1.dfsg/packages/Sundance/src-std-mesh/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/Sundance/src-std-mesh/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/Sundance/src-std-mesh/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -321,7 +321,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2524,10 +2737,11 @@
+ trilinos_sundanceStdMesh
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- )
-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-14 15:28:02.000000000 +0200
+ DEPLIBS sundanceCore sundanceInterop sundanceUtils
+Index: trilinos-10.6.1.dfsg/packages/Sundance/src-utils/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/Sundance/src-utils/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/Sundance/src-utils/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -94,7 +94,7 @@
#
@@ -2537,10 +2751,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
-@@ -298,7 +298,7 @@
+Index: trilinos-10.6.1.dfsg/packages/teuchos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/teuchos/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/teuchos/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -299,7 +299,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2549,9 +2764,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/teuchos/test/FancyOutputting/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/teuchos/test/FancyOutputting/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/teuchos/test/FancyOutputting/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -2,17 +2,17 @@
INCLUDE(PackageAddExecutableAndTest)
@@ -2573,9 +2789,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/ThreadPool/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/ThreadPool/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/ThreadPool/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -64,7 +64,7 @@
#
@@ -2585,9 +2802,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/thyra/adapters/epetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/thyra/adapters/epetra/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/thyra/adapters/epetra/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -10,8 +10,8 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
@@ -2599,9 +2817,10 @@
- DEPLIBS thyra
+ DEPLIBS trilinos_thyra
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/thyra/adapters/epetraext/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/thyra/adapters/epetraext/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/thyra/adapters/epetraext/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -13,8 +13,8 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
@@ -2613,9 +2832,10 @@
- DEPLIBS thyraepetra
+ DEPLIBS trilinos_thyraepetra
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/thyra/adapters/tpetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/thyra/adapters/tpetra/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/thyra/adapters/tpetra/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -12,14 +12,14 @@
ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Epetra)
@@ -2634,9 +2854,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/thyra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/thyra/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/thyra/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -86,7 +86,7 @@
#
@@ -2646,9 +2867,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/thyra/test/nonlinear/models/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/thyra/test/nonlinear/models/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/thyra/test/nonlinear/models/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -13,10 +13,10 @@
APPEND_GLOB(HEADERS ${DIR}/*.hpp)
@@ -2662,9 +2884,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/thyra/test/nonlinear/models/UnitTests/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -6,7 +6,7 @@
SOURCES
Simple2DModelEvaluator_UnitTests.cpp
@@ -2683,52 +2906,10 @@
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-14 15:28:02.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-14 15:28:02.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-14 15:28:02.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-14 15:33:36.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/tpetra/inout/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/tpetra/inout/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/tpetra/inout/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -41,10 +41,10 @@
#
@@ -2742,9 +2923,10 @@
)
# 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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/tpetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/tpetra/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/tpetra/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -33,7 +33,7 @@
#
@@ -2754,21 +2936,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/tpetra/test/BlockMultiVector/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/tpetra/test/BlockMultiVector/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/tpetra/test/BlockMultiVector/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -9,5 +9,5 @@
${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
COMM serial mpi
@@ -2776,11 +2947,12 @@
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-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-14 15:28:02.000000000 +0200
-@@ -18,9 +18,9 @@
- )
+Index: trilinos-10.6.1.dfsg/packages/tpetra/test/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/tpetra/test/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/tpetra/test/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -23,9 +23,9 @@
+ ENDIF()
PACKAGE_ADD_LIBRARY(
- tpetratestlib
@@ -2791,9 +2963,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/tpetra/test/CrsMatrix/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/tpetra/test/CrsMatrix/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/tpetra/test/CrsMatrix/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -17,7 +17,7 @@
ARGS ${ARGS}
COMM serial mpi
@@ -2812,19 +2985,23 @@
# )
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-14 15:28:02.000000000 +0200
-@@ -9,5 +9,5 @@
+Index: trilinos-10.6.1.dfsg/packages/tpetra/test/MultiVector/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/tpetra/test/MultiVector/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/tpetra/test/MultiVector/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
+@@ -9,7 +9,7 @@
${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-14 15:28:02.000000000 +0200
+
+ SET(TIMING_INSTALLS "")
+Index: trilinos-10.6.1.dfsg/packages/tpetra/test/VbrMatrix/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/tpetra/test/VbrMatrix/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/tpetra/test/VbrMatrix/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -14,7 +14,7 @@
SOURCES
VbrMatrix_UnitTests
@@ -2834,9 +3011,10 @@
)
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/TriKota/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/TriKota/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/TriKota/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -164,7 +164,7 @@
ADD_DEFINITIONS(-DHAVE_CONFIG_H)
@@ -2846,9 +3024,10 @@
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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/trilinoscouplings/examples/scaling/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/trilinoscouplings/examples/scaling/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/trilinoscouplings/examples/scaling/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -8,21 +8,21 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_Poisson
@@ -2874,9 +3053,10 @@
NUM_MPI_PROCS 1
ADD_DIR_TO_NAME
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/trilinoscouplings/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/trilinoscouplings/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/trilinoscouplings/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -153,7 +153,7 @@
#
@@ -2886,9 +3066,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/triutils/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/triutils/src/CMakeLists.txt 2011-04-06 14:41:25.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/triutils/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -78,7 +78,7 @@
#
@@ -2898,9 +3079,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -466,7 +466,7 @@
#
@@ -2910,9 +3092,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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-14 15:28:02.000000000 +0200
+Index: trilinos-10.6.1.dfsg/packages/zoltan/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/zoltan/src/CMakeLists.txt 2011-04-06 14:41:26.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/zoltan/src/CMakeLists.txt 2011-04-06 14:41:33.000000000 +0200
@@ -764,11 +764,11 @@
#
@@ -2927,3 +3110,18 @@
HEADERS ${HEADERS}
NOINSTALLHEADERS ${NOINSTALLHEADERS}
SOURCES ${SOURCES}
+Index: trilinos-10.6.1.dfsg/packages/anasazi/tpetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/packages/anasazi/tpetra/src/CMakeLists.txt 2011-04-06 14:55:32.000000000 +0200
++++ trilinos-10.6.1.dfsg/packages/anasazi/tpetra/src/CMakeLists.txt 2011-04-06 14:56:07.000000000 +0200
+@@ -37,8 +37,8 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- anasazitpetra
++ trilinos_anasazitpetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS anasazi tpetra kokkos
++ DEPLIBS trilinos_anasazi trilinos_tpetra trilinos_kokkos
+ )
Modified: packages/trilinos/trunk/debian/patches/soname.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/soname.patch?rev=38320&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/soname.patch (original)
+++ packages/trilinos/trunk/debian/patches/soname.patch Wed Apr 6 14:52:07 2011
@@ -1,6 +1,7 @@
-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
+Index: trilinos-10.6.1.dfsg/cmake/package_arch/PackageLibraryMacros.cmake
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/cmake/package_arch/PackageLibraryMacros.cmake 2011-04-06 13:57:29.000000000 +0200
++++ trilinos-10.6.1.dfsg/cmake/package_arch/PackageLibraryMacros.cmake 2011-04-06 13:57:35.000000000 +0200
@@ -168,6 +168,12 @@
SET_PROPERTY(TARGET ${LIBRARY_NAME} APPEND PROPERTY
LABELS ${PACKAGE_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=38320&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/trilinosversion.patch (original)
+++ packages/trilinos/trunk/debian/patches/trilinosversion.patch Wed Apr 6 14:52:07 2011
@@ -1,12 +1,13 @@
-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
+Index: trilinos-10.6.1.dfsg/cmake/TrilinosVersion.cmake
+===================================================================
+--- trilinos-10.6.1.dfsg.orig/cmake/TrilinosVersion.cmake 2011-04-06 13:58:27.000000000 +0200
++++ trilinos-10.6.1.dfsg/cmake/TrilinosVersion.cmake 2011-04-06 13:58:35.000000000 +0200
@@ -1,5 +1,6 @@
- SET(Trilinos_VERSION "10.4.0")
+ SET(Trilinos_VERSION "10.6.1")
SET(Trilinos_MAJOR_VERSION "10")
-+SET(Trilinos_MINOR_VERSION "4")
- SET(Trilinos_MAJOR_MINOR_VERSION "100400")
- SET(Trilinos_VERSION_STRING "10.4.0")
++SET(Trilinos_MINOR_VERSION "6")
+ SET(Trilinos_MAJOR_MINOR_VERSION "100601")
+ SET(Trilinos_VERSION_STRING "10.6.1")
@@ -11,3 +12,13 @@
SET(TRILINOS_MAJOR_VERSION TRUE)
More information about the debian-science-commits
mailing list