r44377 - in /packages/trilinos/trunk/debian: README.source changelog control patches/libname.patch patches/soname.patch patches/trilinosversion.patch python-pytrilinos.install rules source/ source/format
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Mon Jan 16 07:58:21 UTC 2012
Author: trophime-guest
Date: Mon Jan 16 07:58:21 2012
New Revision: 44377
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44377
Log:
proposed update to 10.8.3
Added:
packages/trilinos/trunk/debian/python-pytrilinos.install
packages/trilinos/trunk/debian/source/
packages/trilinos/trunk/debian/source/format
Modified:
packages/trilinos/trunk/debian/README.source
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
packages/trilinos/trunk/debian/rules
Modified: packages/trilinos/trunk/debian/README.source
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/README.source?rev=44377&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/README.source (original)
+++ packages/trilinos/trunk/debian/README.source Mon Jan 16 07:58:21 2012
@@ -3,15 +3,10 @@
Trilinos source for Debian
--------------------------
-1 - Update of package/*/config/config.{sub,guess} to ensure a
-recent version is available
-
-
-2 - The pdf files that cannot be re-generated from the tarball have been
+1 - The pdf files have been
removed from the archive.
-3 - Packaging makes use of CDBS and quilt. For the latter see
+2 - Packaging makes use of CDBS and quilt. For the latter see
`/usr/share/doc/quilt/README.source'.
-
- -- Christophe Prud'homme <prudhomm at debian.org>, Sun, 7 Dec 2008 15:04:38 +0100
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Fri, 02 Dec 2011 10:55:54 +0200
Modified: packages/trilinos/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/changelog?rev=44377&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/changelog (original)
+++ packages/trilinos/trunk/debian/changelog Mon Jan 16 07:58:21 2012
@@ -1,9 +1,10 @@
-trilinos (10.6.1.dfsg-1.1) unstable; urgency=low
+trilinos (10.8.3.dfsg-1.1) unstable; urgency=low
* Non-maintainer upload.
- * New upstream release
+ * New upstream release (closes: #625027)
+ * debian/control: update Standard-Version to 3.9.2
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Wed, 06 Apr 2011 13:46:05 +0200
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Fri, 02 Dec 2011 10:55:54 +0200
trilinos (10.4.0.dfsg-1) unstable; urgency=low
Modified: packages/trilinos/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/control?rev=44377&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/control (original)
+++ packages/trilinos/trunk/debian/control Mon Jan 16 07:58:21 2012
@@ -3,11 +3,11 @@
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
-Standards-Version: 3.9.1
-XS-Python-Version: >= 2.5
+Build-Depends: quilt (>=0.46-7), debhelper (>= 7.0.50~), cmake, gfortran,
+ libopenmpi-dev, libsuperlu3-dev, libsuitesparse-dev, python-dev (>= 2.6.6-3~),
+ swig2.0, python-numpy, libexpat1-dev, libxml2-dev
+Standards-Version: 3.9.2
+X-Python-Version: >= 2.5
Homepage: http://trilinos.sandia.gov/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/trilinos/trunk
Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk
@@ -69,7 +69,7 @@
Package: python-pytrilinos
Section: python
Architecture: any
-XB-Python-Version: ${python:Versions}
+X-Python-Version: ${python:Versions}
Depends: python-numpy, libtrilinos (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
Conflicts: python-pytrilinos7.0, python-pytrilinos8.0
Replaces: python-pytrilinos7.0, python-pytrilinos8.0
Modified: packages/trilinos/trunk/debian/patches/libname.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/libname.patch?rev=44377&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/libname.patch (original)
+++ packages/trilinos/trunk/debian/patches/libname.patch Mon Jan 16 07:58:21 2012
@@ -1,7 +1,7 @@
-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
+Index: trilinos-10.8.3.dfsg/packages/amesos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/amesos/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/amesos/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -465,7 +465,7 @@
#
@@ -11,10 +11,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/anasazi/epetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/anasazi/epetra/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/anasazi/epetra/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -45,9 +45,9 @@
#
@@ -27,10 +27,10 @@
+ DEPLIBS trilinos_anasazi
DEFINES -DANASAZIEPETRA_LIB_EXPORTS_MODE
)
-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
+Index: trilinos-10.8.3.dfsg/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -62,9 +62,9 @@
#
@@ -43,11 +43,11 @@
+ DEPLIBS trilinos_anasazi
DEFINES -DANASAZIEPETRA_MODELAPLACE_LIB_EXPORTS_MODE
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/anasazi/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/anasazi/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/anasazi/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -169,7 +169,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -56,10 +56,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
DEFINES -DANASAZI_LIB_EXPORTS_MODE
-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
+Index: trilinos-10.8.3.dfsg/packages/anasazi/thyra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/anasazi/thyra/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/anasazi/thyra/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -111,7 +111,7 @@
#
@@ -69,10 +69,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/aztecoo/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/aztecoo/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/aztecoo/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -173,7 +173,7 @@
#
@@ -82,54 +82,83 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
- #
-
- PACKAGE_ADD_LIBRARY(
-- belosepetra
-+ trilinos_belosepetra
- HEADERS ${HEADERS}
- SOURCES ${SOURCES}
-- DEPLIBS belos epetra
-+ DEPLIBS trilinos_belos trilinos_epetra
- )
-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 @@
- #
-
- PACKAGE_ADD_LIBRARY(
-- belos
-+ trilinos_belos
- HEADERS ${HEADERS}
- SOURCES ${SOURCES}
- )
-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 @@
- #
-
- PACKAGE_ADD_LIBRARY(
-- belostpetra
-+ trilinos_belostpetra
- HEADERS ${HEADERS}
- SOURCES ${SOURCES}
-- DEPLIBS belos tpetra kokkos
-+ DEPLIBS trilinos_belos trilinos_tpetra trilinos_kokkos
- )
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/belos/epetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/belos/epetra/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/belos/epetra/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -46,16 +46,16 @@
+ # is a hack to avoid an optional package dependency of Epetra on
+ # Teuchos and Kokkos.
+ PACKAGE_ADD_LIBRARY(
+- belosepetra
++ trilinos_belosepetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS belos epetra tpetra kokkos kokkosnodetsqr kokkosdisttsqr
++ DEPLIBS trilinos_belos trilinos_epetra trilinos_tpetra trilinos_kokkos trilinos_kokkosnodetsqr trilinos_kokkosdisttsqr
+ )
+ ELSE ()
+ PACKAGE_ADD_LIBRARY(
+- belosepetra
++ trilinos_belosepetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS belos epetra
++ DEPLIBS trilinos_belos trilinos_epetra
+ )
+ ENDIF ()
+Index: trilinos-10.8.3.dfsg/packages/belos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/belos/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/belos/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -145,14 +145,14 @@
+ # the appropriate Kokkos libraries, since TSQR is implemented in
+ # Kokkos.
+ PACKAGE_ADD_LIBRARY(
+- belos
++ trilinos_belos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS kokkos kokkosnodetsqr kokkosdisttsqr
++ DEPLIBS trilinos_kokkos trilinos_kokkosnodetsqr trilinos_kokkosdisttsqr
+ )
+ ELSE ()
+ PACKAGE_ADD_LIBRARY(
+- belos
++ trilinos_belos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+Index: trilinos-10.8.3.dfsg/packages/belos/tpetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/belos/tpetra/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/belos/tpetra/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -40,16 +40,16 @@
+ #
+ IF (${PACKAGE_NAME}_ENABLE_TSQR)
+ PACKAGE_ADD_LIBRARY(
+- belostpetra
++ trilinos_belostpetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS belos tpetra kokkos kokkosnodetsqr kokkosdisttsqr
++ DEPLIBS trilinos_belos trilinos_tpetra trilinos_kokkos trilinos_kokkosnodetsqr trilinos_kokkosdisttsqr
+ )
+ ELSE ()
+ PACKAGE_ADD_LIBRARY(
+- belostpetra
++ trilinos_belostpetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS belos tpetra kokkos
++ DEPLIBS trilinos_belos trilinos_tpetra trilinos_kokkos
+ )
+ ENDIF ()
+Index: trilinos-10.8.3.dfsg/packages/CTrilinos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/CTrilinos/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/CTrilinos/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -121,7 +121,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -138,11 +167,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/epetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/epetra/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/epetra/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -210,7 +210,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -151,10 +180,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
DEFINES -DEPETRA_LIB_EXPORTS_MODE
-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
+Index: trilinos-10.8.3.dfsg/packages/epetraext/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/epetraext/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/epetraext/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -432,7 +432,7 @@
#
@@ -164,11 +193,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/fei/base/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/fei/base/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/fei/base/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -243,7 +243,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -177,10 +206,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/fei/support-Trilinos/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/fei/support-Trilinos/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/fei/support-Trilinos/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -75,8 +75,8 @@
#
@@ -192,11 +221,11 @@
- 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 @@
+Index: trilinos-10.8.3.dfsg/packages/fei/test_utils/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/fei/test_utils/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/fei/test_utils/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -135,9 +135,9 @@
#
PACKAGE_ADD_LIBRARY(
@@ -206,11 +235,12 @@
SOURCES ${SOURCES}
- 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
+ TESTONLY
+ )
+Index: trilinos-10.8.3.dfsg/packages/galeri/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/galeri/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/galeri/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -146,7 +146,7 @@
#
@@ -220,10 +250,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/globipack/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/globipack/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/globipack/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -29,7 +29,7 @@
#
@@ -233,11 +263,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/globipack/test/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/globipack/test/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/globipack/test/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -23,7 +23,7 @@
SOURCES
ArmijoPolyInterpLineSearch_UnitTests.cpp
${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
@@ -246,7 +276,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -33,7 +33,7 @@
+@@ -34,7 +34,7 @@
SOURCES
GoldenQuadInterpBracket_UnitTests.cpp
${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
@@ -255,7 +285,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -44,7 +44,7 @@
+@@ -45,7 +45,7 @@
SOURCES
Brents1DMinimization_UnitTests.cpp
${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
@@ -264,7 +294,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -55,7 +55,7 @@
+@@ -56,7 +56,7 @@
SOURCES
BrentsLineSearch_UnitTests.cpp
${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
@@ -273,10 +303,10 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-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
+Index: trilinos-10.8.3.dfsg/packages/globipack/test/meritfuncs/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/globipack/test/meritfuncs/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/globipack/test/meritfuncs/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -14,11 +14,11 @@
APPEND_GLOB(HEADERS ${DIR}/*.hpp)
@@ -291,10 +321,10 @@
)
ADD_SUBDIRECTORY(UnitTests)
-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
+Index: trilinos-10.8.3.dfsg/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -6,7 +6,7 @@
SOURCES
TestLagrPolyMeritFunc1D_UnitTests.cpp
@@ -304,10 +334,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
-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
+Index: trilinos-10.8.3.dfsg/packages/ifpack/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/ifpack/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/ifpack/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -232,7 +232,7 @@
#
@@ -317,10 +347,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/ifpack/test/AztecOO/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/ifpack/test/AztecOO/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/ifpack/test/AztecOO/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -17,7 +17,7 @@
PACKAGE_ADD_EXECUTABLE(
ifp_aztecoo
@@ -330,10 +360,10 @@
)
PACKAGE_COPY_FILES_TO_BINARY_DIR(IfpackAztecOOCopyFiles
-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
+Index: trilinos-10.8.3.dfsg/packages/intrepid/example/Drivers/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/intrepid/example/Drivers/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/intrepid/example/Drivers/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -4,7 +4,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_01
@@ -343,7 +373,7 @@
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 @@
+@@ -14,7 +14,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_02
SOURCES example_02.cpp
@@ -352,7 +382,7 @@
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 @@
+@@ -24,7 +24,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_03
SOURCES example_03.cpp
@@ -361,7 +391,7 @@
ARGS "10 10 10"
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
-@@ -31,7 +31,7 @@
+@@ -34,7 +34,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_04
SOURCES example_04.cpp
@@ -370,7 +400,7 @@
ARGS "1 1"
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
-@@ -40,7 +40,7 @@
+@@ -43,7 +43,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_05
SOURCES example_05.cpp
@@ -379,7 +409,7 @@
ARGS "1 10 10"
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
-@@ -49,7 +49,7 @@
+@@ -52,7 +52,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_06
SOURCES example_06.cpp
@@ -388,7 +418,7 @@
ARGS "1 10 10"
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
-@@ -58,7 +58,7 @@
+@@ -61,7 +61,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_07
SOURCES example_07.cpp
@@ -397,7 +427,7 @@
ARGS "1 10 10"
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
-@@ -67,7 +67,7 @@
+@@ -70,7 +70,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_08
SOURCES example_08.cpp
@@ -406,7 +436,7 @@
ARGS "1 10 10"
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
-@@ -76,7 +76,7 @@
+@@ -79,7 +79,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_09
SOURCES example_09.cpp
@@ -415,7 +445,7 @@
ARGS "1 10 10"
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
-@@ -85,7 +85,7 @@
+@@ -88,7 +88,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_10
SOURCES example_10.cpp
@@ -424,7 +454,7 @@
ARGS "1 10 10 10"
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
-@@ -94,7 +94,7 @@
+@@ -98,7 +98,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_11
SOURCES example_11.cpp
@@ -433,7 +463,7 @@
ARGS "1 10 10 10"
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
-@@ -103,7 +103,7 @@
+@@ -108,7 +108,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_12
SOURCES example_12.cpp
@@ -442,7 +472,7 @@
ARGS "1 10 10 10"
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
-@@ -112,7 +112,7 @@
+@@ -118,7 +118,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_13
SOURCES example_13.cpp
@@ -451,7 +481,7 @@
ARGS "1 10 10 10"
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
-@@ -121,7 +121,7 @@
+@@ -128,7 +128,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_14
SOURCES example_14.cpp
@@ -460,7 +490,7 @@
ARGS "1 10 10 10"
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
-@@ -130,7 +130,7 @@
+@@ -138,7 +138,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_15
SOURCES example_15.cpp
@@ -469,7 +499,7 @@
ARGS "1 10 10 10"
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
-@@ -139,7 +139,7 @@
+@@ -148,7 +148,7 @@
# PACKAGE_ADD_EXECUTABLE_AND_TEST(
# Example_16
# SOURCES example_16.cpp
@@ -478,11 +508,11 @@
# 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 @@
+Index: trilinos-10.8.3.dfsg/packages/intrepid/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/intrepid/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/intrepid/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -214,7 +214,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -491,11 +521,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/isorropia/example/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/isorropia/example/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/isorropia/example/CMakeLists.txt 2011-12-02 14:30:16.000000000 +0100
+@@ -8,48 +8,48 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
matrix_1
SOURCES matrix_1.cpp
@@ -503,10 +533,59 @@
+ DEPLIBS trilinos_isorropia_test_utils
COMM serial mpi
)
-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
+ PACKAGE_ADD_EXECUTABLE(
+ graphedge_weights
+ SOURCES graphedge_weights.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ )
+ PACKAGE_ADD_EXECUTABLE(
+ hgedge_weights
+ SOURCES hgedge_weights.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ )
+ PACKAGE_ADD_EXECUTABLE(
+ part_redist
+ SOURCES part_redist.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ )
+ PACKAGE_ADD_EXECUTABLE(
+ vert_weights
+ SOURCES vert_weights.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ )
+ PACKAGE_ADD_EXECUTABLE(
+ redist_map
+ SOURCES redist_map.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ )
+ PACKAGE_ADD_EXECUTABLE(
+ parallel_matching
+ SOURCES parallel_matching.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ )
+ PACKAGE_ADD_EXECUTABLE(
+ probe_tridiag
+ SOURCES probe_tridiag.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM mpi
+ )
+Index: trilinos-10.8.3.dfsg/packages/isorropia/example/geometric/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/isorropia/example/geometric/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/isorropia/example/geometric/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
example_rcb
@@ -516,36 +595,23 @@
COMM serial mpi
)
-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
- SOURCES levelSchedule.cpp
-- DEPLIBS isorropia_test_utils
-+ DEPLIBS trilinos_isorropia_test_utils
- COMM serial
- )
-
-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 @@
- #
-
+Index: trilinos-10.8.3.dfsg/packages/isorropia/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/isorropia/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/isorropia/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -175,7 +175,7 @@
+ # C) Define the targets for package's library(s)
+ #
PACKAGE_ADD_LIBRARY(
- isorropia
+ trilinos_isorropia
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/isorropia/test/geometric/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/isorropia/test/geometric/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/isorropia/test/geometric/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_geometric
@@ -555,10 +621,10 @@
COMM serial mpi
ARGS
"--f=brack_3D.coords"
-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
+Index: trilinos-10.8.3.dfsg/packages/isorropia/test/levelsolver/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/isorropia/test/levelsolver/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/isorropia/test/levelsolver/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -7,7 +7,7 @@
COMM serial mpi
ARGS
@@ -568,10 +634,10 @@
)
PACKAGE_COPY_FILES_TO_BINARY_DIR(TestLevelSolverCopyFiles
-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
+Index: trilinos-10.8.3.dfsg/packages/isorropia/test/mtx/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/isorropia/test/mtx/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/isorropia/test/mtx/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_balanced_copy
@@ -599,10 +665,10 @@
COMM serial mpi
ARGS
"--f=simple.mtx"
-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
+Index: trilinos-10.8.3.dfsg/packages/isorropia/test/part_sizes/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/isorropia/test/part_sizes/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/isorropia/test/part_sizes/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
part_sizes
@@ -612,10 +678,10 @@
COMM serial mpi
ARGS
)
-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
+Index: trilinos-10.8.3.dfsg/packages/isorropia/test/probing/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/isorropia/test/probing/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/isorropia/test/probing/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -5,7 +5,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_probing
@@ -625,10 +691,10 @@
COMM serial mpi
ARGS
)
-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
+Index: trilinos-10.8.3.dfsg/packages/isorropia/utils/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/isorropia/utils/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/isorropia/utils/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -33,9 +33,9 @@
#
@@ -641,20 +707,23 @@
- DEPLIBS isorropia
+ DEPLIBS trilinos_isorropia
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/kokkos/LinAlg/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/LinAlg/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/kokkos/LinAlg/CMakeLists.txt 2011-12-02 14:08:56.000000000 +0100
+@@ -68,9 +68,9 @@
+ ASSERT_DEFINED(Kokkos_ENABLE_Thrust)
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
-+ 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()
-@@ -74,10 +74,10 @@
+ PACKAGE_ADD_CUDA_LIBRARY(
+- kokkoslinalg_cuda
++ trilinos_kokkoslinalg_cuda
+ SOURCES ${CUDA_SOURCES}
+- DEPLIBS teuchos
++ DEPLIBS trilinos_teuchos
+ )
+ SET(KOKKOS_LINALG_CUDALIBS "kokkoslinalg_cuda")
+ ELSE()
+@@ -82,10 +82,10 @@
#
PACKAGE_ADD_LIBRARY(
@@ -667,10 +736,10 @@
)
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
+Index: trilinos-10.8.3.dfsg/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt 2011-12-02 14:17:40.000000000 +0100
@@ -6,7 +6,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -678,19 +747,57 @@
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
- PACKAGE_ADD_EXECUTABLE_AND_TEST( CrsMatrix_UnitTests
- SOURCES
-@@ -15,5 +15,5 @@
+
+ INCLUDE(PackageAddExecutableAndTest)
+@@ -17,7 +17,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-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
+
+ PACKAGE_ADD_EXECUTABLE_AND_TEST( CrsMatrix_UnitTests
+@@ -27,7 +27,7 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+
+ IF (Kokkos_ENABLE_ThreadPool)
+@@ -38,7 +38,7 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ INSTALLABLE
+ )
+ ENDIF (Kokkos_ENABLE_ThreadPool)
+@@ -51,7 +51,7 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ INSTALLABLE
+ )
+ ENDIF (Kokkos_ENABLE_TBB)
+@@ -64,7 +64,7 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ INSTALLABLE
+ )
+ ENDIF()
+Index: trilinos-10.8.3.dfsg/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -6,7 +6,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -707,10 +814,10 @@
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-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
+Index: trilinos-10.8.3.dfsg/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -6,5 +6,5 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -718,10 +825,10 @@
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-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
+Index: trilinos-10.8.3.dfsg/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -8,5 +8,5 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -729,11 +836,11 @@
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/kokkos/NodeAPI/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/NodeAPI/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/kokkos/NodeAPI/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -99,10 +99,10 @@
#
PACKAGE_ADD_LIBRARY(
@@ -746,10 +853,10 @@
)
PACKAGE_ADD_TEST_DIRECTORIES(test)
-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
+Index: trilinos-10.8.3.dfsg/packages/kokkos/NodeAPI/test/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/NodeAPI/test/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/kokkos/NodeAPI/test/CMakeLists.txt 2011-12-02 14:21:11.000000000 +0100
@@ -9,7 +9,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -768,10 +875,37 @@
)
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
+@@ -35,7 +35,7 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkosnodeapi
++ DEPLIBS trilinos_kokkosnodeapi
+ )
+ APPEND_SET(TIMING_INSTALLS Kokkos_TBBNodeTestAndTiming)
+ ENDIF()
+@@ -50,7 +50,7 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkosnodeapi
++ DEPLIBS trilinos_kokkosnodeapi
+ )
+ APPEND_SET(TIMING_INSTALLS Kokkos_TPINodeTestAndTiming)
+ ENDIF()
+@@ -71,7 +71,7 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkosnodeapi
++ DEPLIBS trilinos_kokkosnodeapi
+ )
+ APPEND_SET(TIMING_INSTALLS Kokkos_ThrustGPUNodeTestAndTiming)
+
+Index: trilinos-10.8.3.dfsg/packages/kokkos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/kokkos/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -44,7 +44,7 @@
#
@@ -781,10 +915,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/komplex/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/komplex/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/komplex/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -69,7 +69,7 @@
#
@@ -794,10 +928,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/mesquite/itaps/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/mesquite/itaps/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/mesquite/itaps/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -9,7 +9,7 @@
SET(${PACKAGE_NAME}_ENABLE_IMESH ON)
MAKEFILE_VAL(${IMESH_DEFS} IMESH_LIBS IMESH_LIBS)
@@ -833,11 +967,11 @@
SET_SOURCE_FILES_PROPERTIES( MsqIMeshP.cpp COMPILE_FLAGS ${MESQUITE_LIB_DEFINES} )
ENDIF(IMESHP_DEFS)
ENDIF()
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/mesquite/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/mesquite/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/mesquite/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -851,7 +851,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -846,20 +980,20 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/mesquite/utils/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/mesquite/utils/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/mesquite/utils/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -32,7 +32,7 @@
+
IF (NOT ${PROJECT_NAME} STREQUAL "Mesquite")
- PACKAGE_ADD_LIBRARY(
-- msqutil
-+ trilinos_msqutil
- HEADERS ${HEADERS}
- SOURCES ${SOURCES}
- )
-@@ -74,7 +74,7 @@
+- ADD_LIBRARY( msqutil STATIC ${SOURCES} ${HEADERS} )
++ ADD_LIBRARY( trilinos_msqutil STATIC ${SOURCES} ${HEADERS} )
+ # PACKAGE_ADD_LIBRARY(
+ # msqutil
+ # HEADERS ${HEADERS}
+@@ -71,7 +71,7 @@
ELSE()
@@ -868,26 +1002,26 @@
ADD_EXECUTABLE( vtkrandom randomize.cpp domain.cpp )
ADD_EXECUTABLE( msqshape shape-improve.cpp domain.cpp )
ADD_EXECUTABLE( vtkxform transform.cpp )
-@@ -82,10 +82,10 @@
+@@ -79,10 +79,10 @@
ENDIF()
--TARGET_LINK_LIBRARIES( vtkrandom mesquite msqutil )
--TARGET_LINK_LIBRARIES( msqshape mesquite msqutil )
--TARGET_LINK_LIBRARIES( vtkxform mesquite msqutil )
--TARGET_LINK_LIBRARIES( msqquality mesquite msqutil )
-+TARGET_LINK_LIBRARIES( vtkrandom trilinos_mesquite trilinos_msqutil )
-+TARGET_LINK_LIBRARIES( msqshape trilinos_mesquite trilinos_msqutil )
-+TARGET_LINK_LIBRARIES( vtkxform trilinos_mesquite trilinos_msqutil )
-+TARGET_LINK_LIBRARIES( msqquality trilinos_mesquite trilinos_msqutil )
+-TARGET_LINK_LIBRARIES( vtkrandom msqutil mesquite )
+-TARGET_LINK_LIBRARIES( msqshape msqutil mesquite )
+-TARGET_LINK_LIBRARIES( vtkxform msqutil mesquite )
+-TARGET_LINK_LIBRARIES( msqquality msqutil mesquite )
++TARGET_LINK_LIBRARIES( vtkrandom trilinos_msqutil trilinos_mesquite )
++TARGET_LINK_LIBRARIES( msqshape trilinos_msqutil trilinos_mesquite )
++TARGET_LINK_LIBRARIES( vtkxform trilinos_msqutil trilinos_mesquite )
++TARGET_LINK_LIBRARIES( msqquality trilinos_msqutil trilinos_mesquite )
IF(${PACKAGE_NAME}_ENABLE_SHARED)
SET( MESQUITE_UTIL_DEFINES "${MESQUITE_DEFINES}" )
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/ml/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/ml/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/ml/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -311,7 +311,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -896,23 +1030,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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(
-- moertel
-+ trilinos_moertel
- HEADERS ${HEADERS}
- SOURCES ${SOURCES}
- )
-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
+Index: trilinos-10.8.3.dfsg/packages/moocho/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/moocho/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/moocho/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -198,7 +198,7 @@
#
@@ -922,11 +1043,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -64,7 +64,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST( ThyraDiagonalQuadraticResponseOnlyOpt
SOURCES
ThyraDiagonalQuadraticResponseOnlyOptMain.cpp
@@ -935,10 +1056,10 @@
NUM_MPI_PROCS 1
)
-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
+Index: trilinos-10.8.3.dfsg/packages/moocho/thyra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/moocho/thyra/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/moocho/thyra/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -21,8 +21,8 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
@@ -950,10 +1071,10 @@
- DEPLIBS moocho
+ DEPLIBS trilinos_moocho
)
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -210,7 +210,7 @@
#
@@ -963,10 +1084,10 @@
HEADERS ${HEADERS}
NOINSTALLHEADERS ${NOINSTALLHEADERS}
SOURCES ${SOURCES}
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/src-belos/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/src-belos/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/src-belos/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -23,7 +23,7 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_BELOS)
@@ -976,10 +1097,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/src-epetra/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/src-epetra/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/src-epetra/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -62,9 +62,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA)
@@ -992,10 +1113,10 @@
+ DEPLIBS trilinos_nox
)
ENDIF()
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/src-lapack/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/src-lapack/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/src-lapack/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -22,9 +22,9 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK)
@@ -1008,10 +1129,10 @@
+ DEPLIBS trilinos_nox
)
ENDIF()
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/src-loca/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/src-loca/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/src-loca/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -351,10 +351,10 @@
IF (NOX_ENABLE_LOCA)
@@ -1025,10 +1146,10 @@
+ DEPLIBS trilinos_nox
)
ENDIF()
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/src-loca/src-epetra/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/src-loca/src-epetra/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/src-loca/src-epetra/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -81,9 +81,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
@@ -1041,10 +1162,10 @@
+ DEPLIBS trilinos_loca trilinos_noxepetra trilinos_nox
)
ENDIF()
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/src-loca/src-lapack/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/src-loca/src-lapack/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/src-loca/src-lapack/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -24,9 +24,9 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA)
@@ -1057,11 +1178,11 @@
+ DEPLIBS trilinos_loca trilinos_noxlapack trilinos_nox
)
ENDIF()
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/nox/src-loca/src-mf/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/src-loca/src-mf/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/src-loca/src-mf/CMakeLists.txt 2011-12-02 14:41:58.000000000 +0100
+@@ -22,9 +22,9 @@
IF (NOX_ENABLE_LOCA AND NOX_ENABLE_MF)
PACKAGE_ADD_LIBRARY(
@@ -1069,11 +1190,14 @@
+ trilinos_locamf
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- )
-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
+- DEPLIBS loca
++ DEPLIBS trilinos_loca
+ )
+ ENDIF()
+Index: trilinos-10.8.3.dfsg/packages/nox/src-loca/src-thyra/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/src-loca/src-thyra/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/src-loca/src-thyra/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -19,9 +19,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA AND NOX_ENABLE_LOCA)
@@ -1086,10 +1210,10 @@
+ DEPLIBS trilinos_loca trilinos_noxthyra trilinos_nox
)
ENDIF()
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/src-petsc/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/src-petsc/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/src-petsc/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -25,9 +25,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_PETSC)
@@ -1104,10 +1228,10 @@
-ENDIF()
\ No newline at end of file
+ENDIF()
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/src-thyra/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/src-thyra/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/src-thyra/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -24,9 +24,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA)
@@ -1122,11 +1246,11 @@
-ENDIF()
\ No newline at end of file
+ENDIF()
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -18,7 +18,7 @@
Problem_Interface.C
brussCont.C
COMM serial mpi
@@ -1135,7 +1259,7 @@
NUM_MPI_PROCS 2
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
-@@ -36,7 +36,7 @@
+@@ -38,7 +38,7 @@
brussHopfCont.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1144,11 +1268,11 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -19,7 +19,7 @@
brussXYZT_ifpack.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1157,7 +1281,7 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -34,7 +34,7 @@
+@@ -36,7 +36,7 @@
brussXYZT_global.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1166,7 +1290,7 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -51,7 +51,7 @@
+@@ -53,7 +53,7 @@
brussXYZT_sequential.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1175,7 +1299,7 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -68,7 +68,7 @@
+@@ -70,7 +70,7 @@
brussXYZT_sequential_IPS.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1184,7 +1308,7 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -85,7 +85,7 @@
+@@ -87,7 +87,7 @@
brussXYZT_sequential_OPS.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1193,7 +1317,7 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -102,7 +102,7 @@
+@@ -104,7 +104,7 @@
brussXYZT_parallel.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1202,7 +1326,7 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -120,7 +120,7 @@
+@@ -122,7 +122,7 @@
# Problem_Interface.C
# brussXYZT_parareal.C
# COMM serial mpi
@@ -1211,7 +1335,7 @@
# ARGS -v
# PASS_REGULAR_EXPRESSION "All tests passed"
# )
-@@ -137,7 +137,7 @@
+@@ -139,7 +139,7 @@
brussXYZT_blockdiagonal.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1220,7 +1344,7 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -154,7 +154,7 @@
+@@ -156,7 +156,7 @@
brussXYZT_bdsdt.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1229,11 +1353,11 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -17,7 +17,7 @@
multipointTcubed.C
COMM mpi
NUM_MPI_PROCS 2
@@ -1242,11 +1366,11 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -15,7 +15,7 @@
Pitchfork.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1255,11 +1379,11 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt 2011-12-02 14:42:15.000000000 +0100
+@@ -15,7 +15,7 @@
Tcubed.C
COMM serial mpi
NUM_MPI_PROCS 4
@@ -1268,7 +1392,7 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -22,7 +22,7 @@
+@@ -26,7 +26,7 @@
Tcubed_constraint.C
COMM serial mpi
NUM_MPI_PROCS 4
@@ -1277,7 +1401,7 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -33,7 +33,7 @@
+@@ -37,7 +37,7 @@
TcubedTP.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1286,10 +1410,19 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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
+@@ -49,7 +49,7 @@
+ TcubedTP_stratimikos.C
+ COMM serial mpi
+ NUM_MPI_PROCS 2
+- DEPLIBS noxtestutils locaepetratestproblems
++ DEPLIBS trilinos_noxtestutils trilinos_locaepetratestproblems
+ ARGS -v
+ PASS_REGULAR_EXPRESSION "All tests passed"
+ )
+Index: trilinos-10.8.3.dfsg/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -28,11 +28,11 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
@@ -1304,11 +1437,11 @@
)
ENDIF()
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -15,7 +15,7 @@
HouseholderBorderedSolve.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1317,7 +1450,7 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -22,7 +22,7 @@
+@@ -26,7 +26,7 @@
HouseholderTransposeBorderedSolve.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1326,7 +1459,7 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -33,7 +33,7 @@
+@@ -37,7 +37,7 @@
TransposeSolve.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1335,7 +1468,7 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -44,7 +44,7 @@
+@@ -48,7 +48,7 @@
CompositeConstraint.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1344,7 +1477,7 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -55,7 +55,7 @@
+@@ -59,7 +59,7 @@
CompositeConstraintMVDX.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1353,7 +1486,7 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-@@ -66,7 +66,7 @@
+@@ -70,7 +70,7 @@
NaturalContResidualFills.C
COMM serial mpi
NUM_MPI_PROCS 2
@@ -1362,10 +1495,10 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -13,7 +13,7 @@
test.C
Laplace2D.C
@@ -1384,10 +1517,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Epetra_Vector
@@ -1406,10 +1539,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -10,7 +10,7 @@
SOURCES ChanContinuation.C
COMM serial mpi
@@ -1437,11 +1570,11 @@
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt 2011-12-02 14:42:25.000000000 +0100
+@@ -21,11 +21,11 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA)
PACKAGE_ADD_LIBRARY(
@@ -1450,10 +1583,15 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
TESTONLY
-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
+- DEPLIBS loca localapack
++ DEPLIBS trilinos_loca trilinos_localapack
+ )
+
+ ENDIF()
+Index: trilinos-10.8.3.dfsg/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -10,7 +10,7 @@
SOURCES BorderedSolve.C
COMM serial mpi
@@ -1490,10 +1628,10 @@
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/test/lapack/NOX/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/lapack/NOX/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/lapack/NOX/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
rosenbrock
@@ -1512,10 +1650,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/test/lapack/StatusTests/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/lapack/StatusTests/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/lapack/StatusTests/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
StatusTests
@@ -1525,10 +1663,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
UserDefinedObjects
@@ -1538,10 +1676,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-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
+Index: trilinos-10.8.3.dfsg/packages/nox/test/utils/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/nox/test/utils/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/nox/test/utils/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -4,7 +4,7 @@
SET(HEADERS "")
@@ -1565,11 +1703,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
TESTONLY
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/optika/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/optika/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/optika/src/CMakeLists.txt 2011-12-02 14:08:22.000000000 +0100
+@@ -28,10 +28,10 @@
PACKAGE_ADD_LIBRARY(
@@ -1578,14 +1716,14 @@
HEADERS ${MOC_HDRS} ${HDRS}
SOURCES ${SRCS} ${MOC_SRCS}
DEPLIBS
-- teuchos ${TPL_Qt_LIBRARIES}
-+ trilinos_teuchos ${TPL_Qt_LIBRARIES}
+- teuchos ${TPL_QT_LIBRARIES}
++ trilinos_teuchos ${TPL_QT_LIBRARIES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/optipack/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/optipack/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/optipack/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -29,7 +29,7 @@
#
@@ -1595,11 +1733,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/optipack/test/NonlinearCG/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/optipack/test/NonlinearCG/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/optipack/test/NonlinearCG/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -8,7 +8,7 @@
SOURCES
NonlinearCG_UnitTests.cpp
${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
@@ -1608,10 +1746,10 @@
COMM serial mpi
ARGS
" " # Make sure default works
-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
+Index: trilinos-10.8.3.dfsg/packages/pamgen/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/pamgen/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/pamgen/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -208,13 +208,13 @@
#
@@ -1628,23 +1766,23 @@
HEADERS ${PE_HEADERS}
SOURCES ${PE_SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/phalanx/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/phalanx/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/phalanx/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -99,7 +99,7 @@
- ENDIF(Phalanx_ENABLE_GPU)
+
PACKAGE_ADD_LIBRARY(
- phalanx
+ trilinos_phalanx
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- 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
+ DEPLIBS ${Phalanx_CUDA_LIBRARY}
+Index: trilinos-10.8.3.dfsg/packages/phalanx/test/DataContainer/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/phalanx/test/DataContainer/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/phalanx/test/DataContainer/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -8,8 +8,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
data_container
@@ -1657,10 +1795,10 @@
- )
\ No newline at end of file
+ )
-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
+Index: trilinos-10.8.3.dfsg/packages/phalanx/test/EvaluatorManager/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/phalanx/test/EvaluatorManager/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/phalanx/test/EvaluatorManager/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
evaluator_manager
@@ -1670,10 +1808,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-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
+Index: trilinos-10.8.3.dfsg/packages/phalanx/test/Field/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/phalanx/test/Field/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/phalanx/test/Field/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -9,7 +9,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
field
@@ -1726,10 +1864,10 @@
-#ENDIF(Phalanx_ENABLE_Intrepid)
\ No newline at end of file
+#ENDIF(Phalanx_ENABLE_Intrepid)
-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
+Index: trilinos-10.8.3.dfsg/packages/phalanx/test/FieldTag/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/phalanx/test/FieldTag/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/phalanx/test/FieldTag/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
field_tag
@@ -1739,10 +1877,10 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-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
+Index: trilinos-10.8.3.dfsg/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -13,10 +13,10 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
intrepid_interoperability
@@ -1757,10 +1895,10 @@
-ENDIF(Phalanx_ENABLE_Intrepid)
\ No newline at end of file
+ENDIF(Phalanx_ENABLE_Intrepid)
-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
+Index: trilinos-10.8.3.dfsg/packages/phalanx/test/Performance/Allocators/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/phalanx/test/Performance/Allocators/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/phalanx/test/Performance/Allocators/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -8,8 +8,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
performance_allocators
@@ -1773,10 +1911,10 @@
- )
\ No newline at end of file
+ )
-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
+Index: trilinos-10.8.3.dfsg/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -6,8 +6,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
performance_bracket_operator
@@ -1789,10 +1927,10 @@
- )
\ No newline at end of file
+ )
-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
+Index: trilinos-10.8.3.dfsg/packages/phalanx/test/Utilities/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/phalanx/test/Utilities/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/phalanx/test/Utilities/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -32,7 +32,7 @@
)
@@ -1814,11 +1952,11 @@
- )
\ No newline at end of file
+ )
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/piro/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/piro/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/piro/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -89,7 +89,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -1827,10 +1965,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/pliris/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/pliris/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/pliris/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -145,7 +145,7 @@
MESSAGE(" Building the Z Complex library")
ADD_DEFINITIONS(-DZCPLX)
@@ -1867,11 +2005,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/PyTrilinos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/PyTrilinos/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/PyTrilinos/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -182,12 +182,12 @@
#
# Define the targets for the PyTrilinos library
@@ -1886,7 +2024,7 @@
PROPERTIES LINK_FLAGS "${EXTRA_LINK_ARGS}"
)
-@@ -236,7 +236,7 @@
+@@ -244,7 +244,7 @@
"${MODULE}.i"
"${MODULE_OUTDIR}"
"${MODULE_NAME}")
@@ -1895,10 +2033,10 @@
# Add the header file to the list of additional "make clean" files
LIST(APPEND ADDITIONAL_CLEAN_FILES "${MODULE}PYTHON_wrap.h")
#
-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
+Index: trilinos-10.8.3.dfsg/packages/rtop/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/rtop/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/rtop/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -77,7 +77,7 @@
#
@@ -1908,10 +2046,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/rythmos/adapters/gaasp/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/rythmos/adapters/gaasp/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/rythmos/adapters/gaasp/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -31,10 +31,10 @@
#
@@ -1925,10 +2063,10 @@
)
-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
+Index: trilinos-10.8.3.dfsg/packages/rythmos/adapters/gaasp/test/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/rythmos/adapters/gaasp/test/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/rythmos/adapters/gaasp/test/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_gaasp_adapters
@@ -1938,10 +2076,10 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-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
+Index: trilinos-10.8.3.dfsg/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -27,7 +27,7 @@
#
@@ -1951,11 +2089,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/rythmos/example/diagonalTransient/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/rythmos/example/diagonalTransient/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/rythmos/example/diagonalTransient/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -12,7 +12,7 @@
PACKAGE_ADD_EXECUTABLE(
diagonalTransient
SOURCES ${SOURCES}
@@ -1964,10 +2102,10 @@
COMM serial mpi
)
-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
+Index: trilinos-10.8.3.dfsg/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
1DfemTransient
@@ -1977,11 +2115,11 @@
COMM serial mpi
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -12,7 +12,7 @@
PACKAGE_ADD_EXECUTABLE(
timeDiscretizedBackwardEuler
SOURCES ${SOURCES}
@@ -1990,10 +2128,10 @@
COMM serial mpi
)
-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
+Index: trilinos-10.8.3.dfsg/packages/rythmos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/rythmos/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/rythmos/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -31,7 +31,7 @@
#
@@ -2017,10 +2155,10 @@
)
ENDIF()
-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
+Index: trilinos-10.8.3.dfsg/packages/rythmos/test/Charon/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/rythmos/test/Charon/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/rythmos/test/Charon/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -9,7 +9,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
CharonRythmos_UnitTest
@@ -2030,10 +2168,10 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-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
+Index: trilinos-10.8.3.dfsg/packages/rythmos/test/ConvergenceTest/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/rythmos/test/ConvergenceTest/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/rythmos/test/ConvergenceTest/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -23,7 +23,7 @@
SOURCES
${COMMON_SOURCES}
@@ -2043,10 +2181,10 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-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
+Index: trilinos-10.8.3.dfsg/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
vdp
@@ -2056,11 +2194,11 @@
COMM serial mpi
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/rythmos/test/simpleAdjoint/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/rythmos/test/simpleAdjoint/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/rythmos/test/simpleAdjoint/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -12,7 +12,7 @@
PACKAGE_ADD_EXECUTABLE(
simpleAdjoint
SOURCES ${SOURCES}
@@ -2069,10 +2207,10 @@
COMM serial mpi
)
-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
+Index: trilinos-10.8.3.dfsg/packages/rythmos/test/ThetaStepper/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/rythmos/test/ThetaStepper/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/rythmos/test/ThetaStepper/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ThetaStepper_UnitTest
@@ -2082,11 +2220,11 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/rythmos/test/UnitTest/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/rythmos/test/UnitTest/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/rythmos/test/UnitTest/CMakeLists.txt 2011-12-02 14:29:15.000000000 +0100
+@@ -17,7 +17,7 @@
#PACKAGE_ADD_EXECUTABLE_AND_TEST(
# UnitTest
# SOURCES ${SOURCES}
@@ -2095,16 +2233,16 @@
# COMM serial
# STANDARD_PASS_OUTPUT
# )
-@@ -23,7 +23,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- ConvergenceTestHelpers_UnitTest
- SOURCES Rythmos_ConvergenceTestHelpers_UnitTest.cpp Rythmos_UnitTest.cpp
-- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-@@ -31,7 +31,7 @@
+@@ -26,7 +26,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ConvergenceTestHelpers_UnitTest
+ SOURCES Rythmos_ConvergenceTestHelpers_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -35,7 +35,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
CubicSplineInterpolator_UnitTest
SOURCES Rythmos_CubicSplineInterpolator_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2113,7 +2251,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
XHOSTTYPE Darwin
-@@ -40,7 +40,7 @@
+@@ -44,7 +44,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
DataStore_UnitTest
SOURCES Rythmos_DataStore_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2122,7 +2260,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -48,7 +48,7 @@
+@@ -52,7 +52,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
DefaultIntegrator_UnitTest
SOURCES Rythmos_DefaultIntegrator_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2131,7 +2269,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -56,7 +56,7 @@
+@@ -60,7 +60,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ExplicitRK_UnitTest
SOURCES Rythmos_ExplicitRK_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2140,7 +2278,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -64,7 +64,7 @@
+@@ -68,7 +68,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
HermiteInterpolator_UnitTest
SOURCES Rythmos_HermiteInterpolator_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2149,7 +2287,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -72,7 +72,7 @@
+@@ -76,7 +76,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ImplicitRK_UnitTest
SOURCES Rythmos_ImplicitRK_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2158,7 +2296,7 @@
COMM serial # MPI should be okay (but see below)!
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
-@@ -84,7 +84,7 @@
+@@ -88,7 +88,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
IntegratorBuilder_UnitTest
SOURCES Rythmos_IntegratorBuilder_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2167,7 +2305,7 @@
COMM serial # MPI should be okay (but see below)!
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
-@@ -96,7 +96,7 @@
+@@ -100,7 +100,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
InterpolationBuffer_UnitTest
SOURCES Rythmos_InterpolationBuffer_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2176,7 +2314,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -104,7 +104,7 @@
+@@ -108,7 +108,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
LinearInterpolator_UnitTest
SOURCES Rythmos_LinearInterpolator_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2185,7 +2323,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -113,7 +113,7 @@
+@@ -117,7 +117,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Quadrature_UnitTest
SOURCES Rythmos_Quadrature_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2194,7 +2332,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -122,7 +122,7 @@
+@@ -126,7 +126,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
RKButcherTableau_UnitTest
SOURCES Rythmos_RKButcherTableau_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2203,7 +2341,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -131,7 +131,7 @@
+@@ -135,7 +135,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
SinCosModel_UnitTest
SOURCES Rythmos_SinCosModel_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2212,7 +2350,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -141,7 +141,7 @@
+@@ -145,7 +145,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
VanderPolModel_UnitTest
SOURCES Rythmos_VanderPolModel_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2221,7 +2359,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -149,7 +149,7 @@
+@@ -153,7 +153,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
AdjointModelEvaluator_UnitTest
SOURCES Rythmos_AdjointModelEvaluator_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2230,25 +2368,25 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -157,7 +157,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- ForwardSensitivity_UnitTest
- SOURCES Rythmos_ForwardSensitivity_UnitTest.cpp Rythmos_UnitTest.cpp
-- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-@@ -165,7 +165,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- ImplicitBDF_UnitTest
- SOURCES Rythmos_ImplicitBDF_UnitTest.cpp Rythmos_UnitTest.cpp
-- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-@@ -173,7 +173,7 @@
+@@ -162,7 +162,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ForwardSensitivity_UnitTest
+ SOURCES Rythmos_ForwardSensitivity_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -170,7 +170,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ImplicitBDF_UnitTest
+ SOURCES Rythmos_ImplicitBDF_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -179,7 +179,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
BasicDiscreteAdjointStepperTester_UnitTest
SOURCES Rythmos_BasicDiscreteAdjointStepperTester_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2257,16 +2395,16 @@
HOST None
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
-@@ -183,7 +183,7 @@
+@@ -189,7 +189,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
StepperBuilder_UnitTest
SOURCES Rythmos_StepperBuilder_UnitTest.cpp Rythmos_UnitTest.cpp
- DEPLIBS rythmos_test_models
+ DEPLIBS trilinos_rythmos_test_models
NUM_MPI_PROCS 1
+ XHOSTTYPE_TEST AIX
STANDARD_PASS_OUTPUT
- )
-@@ -192,7 +192,7 @@
+@@ -199,7 +199,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
StepperHelpers_UnitTest
SOURCES Rythmos_StepperHelpers_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2275,7 +2413,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -201,7 +201,7 @@
+@@ -208,7 +208,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
TimeRange_UnitTest
SOURCES Rythmos_TimeRange_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2284,7 +2422,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -209,7 +209,7 @@
+@@ -216,7 +216,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
PointwiseInterpolationBufferAppender_UnitTest
SOURCES Rythmos_PointwiseInterpolationBufferAppender_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2293,16 +2431,16 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -217,7 +217,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- StepperValidator_UnitTest
- SOURCES Rythmos_StepperValidator_UnitTest.cpp Rythmos_UnitTest.cpp
-- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-@@ -225,7 +225,7 @@
+@@ -234,7 +234,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ StepperValidator_UnitTest
+ SOURCES Rythmos_StepperValidator_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ ${STEPPER_VALITATOR_ARGS}
+ STANDARD_PASS_OUTPUT
+@@ -245,7 +245,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
GlobalErrorEstimator_UnitTest
SOURCES Rythmos_GlobalErrorEstimator_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2311,7 +2449,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -233,7 +233,7 @@
+@@ -253,7 +253,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Thyra_UnitTest
SOURCES Rythmos_Thyra_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2320,43 +2458,43 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -241,7 +241,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- ForwardEulerStepper_UnitTest
- SOURCES Rythmos_ForwardEuler_UnitTest.cpp Rythmos_UnitTest.cpp
-- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-@@ -249,7 +249,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- BackwardEulerStepper_UnitTest
- SOURCES Rythmos_BackwardEuler_UnitTest.cpp Rythmos_UnitTest.cpp
-- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-@@ -257,7 +257,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- ForwardSensitivityExplicitModelEvaluator_UnitTest
- SOURCES Rythmos_ForwardSensitivityExplicitModelEvaluator_UnitTest.cpp Rythmos_UnitTest.cpp
-- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-@@ -265,7 +265,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- ForwardSensitivityImplicitModelEvaluator_UnitTest
- SOURCES Rythmos_ForwardSensitivityImplicitModelEvaluator_UnitTest.cpp Rythmos_UnitTest.cpp
-- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-@@ -273,7 +273,7 @@
+@@ -262,7 +262,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ForwardEulerStepper_UnitTest
+ SOURCES Rythmos_ForwardEuler_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -270,7 +270,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ BackwardEulerStepper_UnitTest
+ SOURCES Rythmos_BackwardEuler_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -278,7 +278,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ForwardSensitivityExplicitModelEvaluator_UnitTest
+ SOURCES Rythmos_ForwardSensitivityExplicitModelEvaluator_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -286,7 +286,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ForwardSensitivityImplicitModelEvaluator_UnitTest
+ SOURCES Rythmos_ForwardSensitivityImplicitModelEvaluator_UnitTest.cpp Rythmos_UnitTest.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+@@ -295,7 +295,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
StateSerializerStrategy_UnitTest
SOURCES Rythmos_StateSerializerStrategy_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2365,7 +2503,7 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -281,7 +281,7 @@
+@@ -303,7 +303,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
StackedStepper_UnitTest
SOURCES Rythmos_StackedStepper_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2374,7 +2512,7 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-@@ -289,7 +289,7 @@
+@@ -311,7 +311,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ForwardSensitivityStepperTester_UnitTest
SOURCES Rythmos_ForwardSensitivityStepperTester_UnitTest.cpp Rythmos_UnitTest.cpp
@@ -2383,20 +2521,20 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-@@ -297,7 +297,7 @@
- PACKAGE_ADD_EXECUTABLE_AND_TEST(
- TestModelBuilder_UnitTest
- SOURCES Rythmos_TestModelBuilder_UnitTest.cpp Rythmos_UnitTest.cpp Rythmos_UnitTestModels.cpp
-- DEPLIBS rythmos_test_models
-+ DEPLIBS trilinos_rythmos_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-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 @@
+@@ -320,7 +320,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ TestModelBuilder_UnitTest
+ SOURCES Rythmos_TestModelBuilder_UnitTest.cpp Rythmos_UnitTest.cpp Rythmos_UnitTestModels.cpp
+- DEPLIBS rythmos_test_models
++ DEPLIBS trilinos_rythmos_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+Index: trilinos-10.8.3.dfsg/packages/sacado/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/sacado/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/sacado/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -256,7 +256,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2405,10 +2543,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/sacado/test/utils/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/sacado/test/utils/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/sacado/test/utils/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -35,9 +35,9 @@
#
@@ -2421,11 +2559,11 @@
+# DEPLIBS trilinos_sacado
# TESTONLY
# )
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/shards/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/shards/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/shards/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -51,7 +51,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2434,10 +2572,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -39,7 +39,7 @@
#
@@ -2447,11 +2585,11 @@
NOINSTALLHEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2011-12-02 15:01:39.000000000 +0100
+@@ -48,10 +48,10 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2459,24 +2597,31 @@
+ trilinos_stk_mesh_base
NOINSTALLHEADERS ${HEADERS} ${HEADERS_IMPL}
SOURCES ${SOURCES} ${SOURCES_IMPL}
- )
-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 @@
+- DEPLIBS stk_util_env stk_util_parallel
++ DEPLIBS trilinos_stk_util_env trilinos_stk_util_parallel
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt 2011-12-02 15:01:47.000000000 +0100
+@@ -42,9 +42,9 @@
#
PACKAGE_ADD_LIBRARY(
- stk_mesh_fem
+ trilinos_stk_mesh_fem
NOINSTALLHEADERS ${HEADERS} ${HEADERS_IMPL}
+- DEPLIBS stk_mesh_base
++ DEPLIBS trilinos_stk_mesh_base
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
+
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_search/stk_search/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_search/stk_search/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stk/stk_search/stk_search/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -54,7 +54,7 @@
#
@@ -2486,49 +2631,56 @@
NOINSTALLHEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -59,8 +59,8 @@
#
PACKAGE_ADD_LIBRARY(
- stk_util_diag
+- DEPLIBS stk_util_parallel
+ trilinos_stk_util_diag
++ DEPLIBS trilinos_stk_util_parallel
NOINSTALLHEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -70,8 +70,8 @@
#
PACKAGE_ADD_LIBRARY(
- stk_util_env
+- DEPLIBS stk_util_util
+ trilinos_stk_util_env
++ DEPLIBS trilinos_stk_util_util
NOINSTALLHEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2011-12-02 15:03:30.000000000 +0100
+@@ -55,9 +55,9 @@
#
PACKAGE_ADD_LIBRARY(
- stk_util_parallel
+ trilinos_stk_util_parallel
NOINSTALLHEADERS ${HEADERS}
- SOURCES ${SOURCES}
- )
-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
+- DEPLIBS stk_util_env
++ DEPLIBS trilinos_stk_util_env
+ SOURCES ${SOURCES}
+ )
+
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -43,7 +43,7 @@
#
@@ -2538,10 +2690,10 @@
NOINSTALLHEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_util/stk_util/util/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -41,7 +41,7 @@
#
@@ -2551,11 +2703,11 @@
NOINSTALLHEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/stokhos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stokhos/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stokhos/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -283,7 +283,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2564,10 +2716,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/stratimikos/adapters/amesos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stratimikos/adapters/amesos/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stratimikos/adapters/amesos/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -16,7 +16,7 @@
)
@@ -2577,10 +2729,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -16,7 +16,7 @@
)
@@ -2590,10 +2742,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/stratimikos/adapters/belos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stratimikos/adapters/belos/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stratimikos/adapters/belos/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -11,7 +11,7 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
@@ -2603,10 +2755,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -12,7 +12,7 @@
)
@@ -2616,10 +2768,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/stratimikos/adapters/ml/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stratimikos/adapters/ml/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stratimikos/adapters/ml/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -12,7 +12,7 @@
)
@@ -2629,10 +2781,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/stratimikos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stratimikos/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/stratimikos/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -45,33 +45,33 @@
ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
@@ -2673,11 +2825,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
DEPLIBS ${DEPLIBS}
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/Sundance/src-core/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/Sundance/src-core/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/Sundance/src-core/CMakeLists.txt 2011-12-02 14:57:51.000000000 +0100
+@@ -395,8 +395,8 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2685,12 +2837,14 @@
+ trilinos_sundanceCore
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- 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 @@
+- DEPLIBS sundanceUtils sundanceInterop playa
++ DEPLIBS trilinos_sundanceUtils trilinos_sundanceInterop trilinos_playa
+ )
+Index: trilinos-10.8.3.dfsg/packages/Sundance/src-interop/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/Sundance/src-interop/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/Sundance/src-interop/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -50,8 +50,8 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2698,25 +2852,14 @@
+ trilinos_sundanceInterop
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- 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(
-- TSFExtended
-+ trilinos_TSFExtended
- HEADERS ${HEADERS}
- SOURCES ${SOURCES}
- 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 @@
+- DEPLIBS sundanceUtils
++ DEPLIBS trilinos_sundanceUtils
+ )
+Index: trilinos-10.8.3.dfsg/packages/Sundance/src-std-framework/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/Sundance/src-std-framework/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/Sundance/src-std-framework/CMakeLists.txt 2011-12-02 14:58:10.000000000 +0100
+@@ -348,8 +348,8 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2724,12 +2867,14 @@
+ trilinos_sundanceStdFwk
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- 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 @@
+- DEPLIBS sundanceCore sundanceStdMesh sundanceInterop sundanceUtils playa
++ DEPLIBS trilinos_sundanceCore trilinos_sundanceStdMesh trilinos_sundanceInterop trilinos_sundanceUtils trilinos_playa
+ )
+Index: trilinos-10.8.3.dfsg/packages/Sundance/src-std-mesh/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/Sundance/src-std-mesh/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/Sundance/src-std-mesh/CMakeLists.txt 2011-12-02 14:58:31.000000000 +0100
+@@ -323,8 +323,8 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2737,12 +2882,14 @@
+ trilinos_sundanceStdMesh
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- 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 @@
+- DEPLIBS sundanceCore sundanceInterop sundanceUtils playa
++ DEPLIBS trilinos_sundanceCore trilinos_sundanceInterop trilinos_sundanceUtils trilinos_playa
+ )
+Index: trilinos-10.8.3.dfsg/packages/Sundance/src-utils/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/Sundance/src-utils/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/Sundance/src-utils/CMakeLists.txt 2011-12-02 14:58:18.000000000 +0100
+@@ -90,8 +90,8 @@
#
PACKAGE_ADD_LIBRARY(
@@ -2750,13 +2897,15 @@
+ trilinos_sundanceUtils
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- )
-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 @@
- #
+- DEPLIBS playa
++ DEPLIBS trilinos_playa
+ )
+Index: trilinos-10.8.3.dfsg/packages/teuchos/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/teuchos/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/teuchos/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -363,7 +363,7 @@
+ ENDIF()
PACKAGE_ADD_LIBRARY(
- teuchos
@@ -2764,10 +2913,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
DEFINES -DTEUCHOS_LIB_EXPORTS_MODE
-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
+Index: trilinos-10.8.3.dfsg/packages/teuchos/test/FancyOutputting/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/teuchos/test/FancyOutputting/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/teuchos/test/FancyOutputting/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -2,17 +2,17 @@
INCLUDE(PackageAddExecutableAndTest)
@@ -2789,10 +2938,10 @@
COMM serial mpi
STANDARD_PASS_OUTPUT
)
-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
+Index: trilinos-10.8.3.dfsg/packages/ThreadPool/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/ThreadPool/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/ThreadPool/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -64,7 +64,7 @@
#
@@ -2802,11 +2951,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/thyra/adapters/epetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/thyra/adapters/epetra/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/thyra/adapters/epetra/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -10,7 +10,7 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
PACKAGE_ADD_LIBRARY(
@@ -2814,14 +2963,12 @@
+ trilinos_thyraepetra
HEADERS ${HEADERS}
SOURCES ${SOURCES}
-- DEPLIBS thyra
-+ DEPLIBS trilinos_thyra
- )
-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 @@
+ )
+Index: trilinos-10.8.3.dfsg/packages/thyra/adapters/epetraext/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/thyra/adapters/epetraext/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/thyra/adapters/epetraext/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -13,7 +13,7 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
PACKAGE_ADD_LIBRARY(
@@ -2829,23 +2976,12 @@
+ trilinos_thyraepetraext
HEADERS ${HEADERS}
SOURCES ${SOURCES}
-- DEPLIBS thyraepetra
-+ DEPLIBS trilinos_thyraepetra
- )
-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)
- IF (${PACKAGE_NAME}_ENABLE_Epetra)
-- SET(DEPSLIBS thyraepetra)
-+ SET(DEPSLIBS trilinos_thyraepetra)
- ELSE()
-- SET(DEPSLIBS thyra)
-+ SET(DEPSLIBS trilinos_thyra)
- ENDIF()
+ )
+Index: trilinos-10.8.3.dfsg/packages/thyra/adapters/tpetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/thyra/adapters/tpetra/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/thyra/adapters/tpetra/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -11,7 +11,7 @@
PACKAGE_ADD_LIBRARY(
@@ -2853,13 +2989,13 @@
+ trilinos_thyratpetra
HEADERS ${HEADERS}
SOURCES ${SOURCES}
- DEPLIBS ${DEPSLIBS}
-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 @@
- #
+ )
+Index: trilinos-10.8.3.dfsg/packages/thyra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/thyra/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/thyra/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -9,7 +9,7 @@
+ APPEND_GLOB(SOURCES ${DIR}/*.cpp)
PACKAGE_ADD_LIBRARY(
- thyra
@@ -2867,49 +3003,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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)
-
- PACKAGE_ADD_LIBRARY(
-- thyra_nonlinear_test_models
-+ trilinos_thyra_nonlinear_test_models
- HEADERS ${HEADERS}
- SOURCES ${SOURCES}
-- DEPLIBS thyra
-+ DEPLIBS trilinos_thyra
- TESTONLY
- )
-
-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
- ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
-- DEPLIBS thyra_nonlinear_test_models
-+ DEPLIBS trilinos_thyra_nonlinear_test_models
- NUM_MPI_PROCS 1
- STANDARD_PASS_OUTPUT
- )
-@@ -17,7 +17,7 @@
- SOURCES
- DiagonalQuadraticResponseOnlyModelEvaluator_UnitTests.cpp
- ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
-- DEPLIBS thyra_nonlinear_test_models
-+ DEPLIBS trilinos_thyra_nonlinear_test_models
- COMM serial mpi
- )
-
-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
+Index: trilinos-10.8.3.dfsg/packages/tpetra/inout/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/tpetra/inout/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/tpetra/inout/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -41,10 +41,10 @@
#
@@ -2923,10 +3020,10 @@
)
# PACKAGE_ADD_TEST_DIRECTORIES(test)
-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
+Index: trilinos-10.8.3.dfsg/packages/tpetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/tpetra/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/tpetra/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -33,7 +33,7 @@
#
@@ -2936,22 +3033,22 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/tpetra/test/BlockMultiVector/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/tpetra/test/BlockMultiVector/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/tpetra/test/BlockMultiVector/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -9,5 +9,5 @@
- ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+ ${TEUCHOS_STD_UNIT_TEST_MAIN}
COMM serial mpi
STANDARD_PASS_OUTPUT
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/tpetra/test/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/tpetra/test/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/tpetra/test/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -27,9 +27,9 @@
ENDIF()
PACKAGE_ADD_LIBRARY(
@@ -2963,10 +3060,10 @@
TESTONLY
)
-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
+Index: trilinos-10.8.3.dfsg/packages/tpetra/test/CrsMatrix/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/tpetra/test/CrsMatrix/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/tpetra/test/CrsMatrix/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -17,7 +17,7 @@
ARGS ${ARGS}
COMM serial mpi
@@ -2975,22 +3072,49 @@
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi trilinos_tpetratestlib
)
- # PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
@@ -28,7 +28,7 @@
- # ARGS ${ARGS}
- # COMM serial mpi
- # STANDARD_PASS_OUTPUT
--# DEPLIBS kokkos kokkoslinalg kokkosnodeapi tpetrainout tpetratestlib
-+# DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi trilinos_tpetrainout trilinos_tpetratestlib
- # )
+ # ARGS ${ARGS}
+ COMM serial mpi
+ STANDARD_PASS_OUTPUT
+- DEPLIBS tpetraext tpetratestlib
++ DEPLIBS trilinos_tpetraext trilinos_tpetratestlib
+ )
PACKAGE_COPY_FILES_TO_BINARY_DIR(TpetraCrsMatrixCopyFiles
-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
+@@ -49,7 +49,7 @@
+ ARGS ${ARGS}
+ COMM serial mpi
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi tpetrainout tpetratestlib
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi trilinos_tpetrainout trilinos_tpetratestlib
+ )
+
+ SET(TIMING_INSTALLS "")
+@@ -59,7 +59,7 @@
+ CRSTiming_TBB
+ SOURCES CRSTiming_TBB
+ COMM mpi
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+ APPEND_SET(TIMING_INSTALLS Tpetra_CRSTiming_TBB)
+ ENDIF()
+@@ -69,7 +69,7 @@
+ CRSTiming_TPI
+ SOURCES CRSTiming_TPI
+ COMM mpi
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+ APPEND_SET(TIMING_INSTALLS Tpetra_CRSTiming_TPI)
+ ENDIF()
+Index: trilinos-10.8.3.dfsg/packages/tpetra/test/MultiVector/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/tpetra/test/MultiVector/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/tpetra/test/MultiVector/CMakeLists.txt 2011-12-02 14:44:03.000000000 +0100
@@ -9,7 +9,7 @@
- ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+ ${TEUCHOS_STD_UNIT_TEST_MAIN}
COMM serial mpi
STANDARD_PASS_OUTPUT
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
@@ -2998,37 +3122,73 @@
)
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
+@@ -19,7 +19,7 @@
+ GEMMTiming_TBB
+ SOURCES GEMMTiming_TBB
+ COMM mpi
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+ APPEND_SET(TIMING_INSTALLS Tpetra_GEMMTiming_TBB)
+ ENDIF()
+@@ -29,7 +29,7 @@
+ GEMMTiming_TPI
+ SOURCES GEMMTiming_TPI
+ COMM mpi
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+ APPEND_SET(TIMING_INSTALLS Tpetra_GEMMTiming_TPI)
+ ENDIF()
+@@ -39,7 +39,7 @@
+ GEMMTiming_Thrust
+ SOURCES GEMMTiming_Thrust
+ COMM mpi
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+ APPEND_SET(TIMING_INSTALLS Tpetra_GEMMTiming_Thrust)
+ ENDIF()
+Index: trilinos-10.8.3.dfsg/packages/tpetra/test/VbrMatrix/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/tpetra/test/VbrMatrix/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/tpetra/test/VbrMatrix/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -14,7 +14,7 @@
SOURCES
VbrMatrix_UnitTests
- ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+ ${TEUCHOS_STD_UNIT_TEST_MAIN}
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi tpetratestlib
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi trilinos_tpetratestlib
)
PACKAGE_ADD_TEST(
-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)
-
- PACKAGE_ADD_LIBRARY(
-- trikota
-+ trilinos_trikota
- HEADERS ${HEADERS}
- SOURCES ${SOURCES}
- IMPORTEDLIBS ${DAKOTA_LIBS}
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/TriKota/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/TriKota/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/TriKota/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -206,7 +206,7 @@
+ # TriKotaConfig.cmake and Makefile.export.TriKota. There should be a better
+ # way of doing this...
+ PACKAGE_ADD_LIBRARY(
+- trikota
++ trilinos_trikota
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ DEPLIBS ${Dakota_EXTRA_LIBRARIES}
+@@ -221,7 +221,7 @@
+ ${PACKAGE_BINARY_DIR}/Dakota/install/lib/)
+
+ PACKAGE_ADD_LIBRARY(
+- trikota
++ trilinos_trikota
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ DEPLIBS ${DAKOTA_LIBS}
+Index: trilinos-10.8.3.dfsg/packages/trilinoscouplings/examples/scaling/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/trilinoscouplings/examples/scaling/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/trilinoscouplings/examples/scaling/CMakeLists.txt 2011-12-02 14:51:59.000000000 +0100
+@@ -8,28 +8,28 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_Poisson
SOURCES example_Poisson.cpp
@@ -3053,11 +3213,28 @@
NUM_MPI_PROCS 1
ADD_DIR_TO_NAME
)
-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 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Example_StabilizatedADR
+ SOURCES example_StabilizedADR.cpp
+- DEPLIBS epetra epetraext pamgen aztecoo amesos ml
++ DEPLIBS trilinos_epetra trilinos_epetraext trilinos_pamgen trilinos_aztecoo trilinos_amesos ml
+ NUM_MPI_PROCS 1
+ ADD_DIR_TO_NAME
+ )
+@@ -52,7 +52,7 @@
+ PACKAGE_ADD_EXECUTABLE(
+ Example_Poisson_STK
+ SOURCES example_Poisson_stk.cpp
+- DEPLIBS epetra epetraext aztecoo amesos ml
++ DEPLIBS trilinos_epetra trilinos_epetraext trilinos_aztecoo trilinos_amesos ml
+ ADD_DIR_TO_NAME
+ )
+ PACKAGE_COPY_FILES_TO_BINARY_DIR(CopyMeshFiles
+Index: trilinos-10.8.3.dfsg/packages/trilinoscouplings/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/trilinoscouplings/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/trilinoscouplings/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -155,7 +155,7 @@
#
PACKAGE_ADD_LIBRARY(
@@ -3066,10 +3243,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/triutils/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/triutils/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/triutils/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -78,7 +78,7 @@
#
@@ -3079,10 +3256,10 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+Index: trilinos-10.8.3.dfsg/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
@@ -466,7 +466,7 @@
#
@@ -3092,11 +3269,11 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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 @@
+Index: trilinos-10.8.3.dfsg/packages/zoltan/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/zoltan/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/zoltan/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -771,11 +771,11 @@
#
IF (NOT TPL_ENABLE_MPI)
@@ -3110,18 +3287,1091 @@
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
- )
+Index: trilinos-10.8.3.dfsg/packages/anasazi/tpetra/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/anasazi/tpetra/src/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/anasazi/tpetra/src/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -40,17 +40,17 @@
+ #
+ IF (${PACKAGE_NAME}_ENABLE_TSQR)
+ PACKAGE_ADD_LIBRARY(
+- anasazitpetra
++ trilinos_anasazitpetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS anasazi tpetra kokkos kokkosnodetsqr kokkosdisttsqr
++ DEPLIBS trilinos_anasazi trilinos_tpetra trilinos_kokkos trilinos_kokkosnodetsqr trilinos_kokkosdisttsqr
+ )
+ ELSE ()
+ PACKAGE_ADD_LIBRARY(
+- anasazitpetra
++ trilinos_anasazitpetra
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS anasazi tpetra kokkos
++ DEPLIBS trilinos_anasazi trilinos_tpetra trilinos_kokkos
+ )
+ ENDIF ()
+
+Index: trilinos-10.8.3.dfsg/packages/tpetra/ext/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/tpetra/ext/CMakeLists.txt 2011-12-02 12:50:06.000000000 +0100
++++ trilinos-10.8.3.dfsg/packages/tpetra/ext/CMakeLists.txt 2011-12-02 14:02:40.000000000 +0100
+@@ -41,10 +41,10 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- tpetraext
++ trilinos_tpetraext
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS tpetra
++ DEPLIBS trilinos_tpetra
+ )
+
+ # PACKAGE_ADD_TEST_DIRECTORIES(test)
+Index: trilinos-10.8.3.dfsg/packages/moertel/src/mesh/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/moertel/src/mesh/CMakeLists.txt 2011-10-12 17:23:02.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/moertel/src/mesh/CMakeLists.txt 2011-12-02 14:05:25.000000000 +0100
+@@ -37,7 +37,7 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- moertelmesh
++ trilinos_moertelmesh
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+Index: trilinos-10.8.3.dfsg/packages/moertel/src/mortar/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/moertel/src/mortar/CMakeLists.txt 2011-10-12 17:23:02.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/moertel/src/mortar/CMakeLists.txt 2011-12-02 14:04:48.000000000 +0100
+@@ -96,7 +96,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- moertel
++ trilinos_moertel
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+Index: trilinos-10.8.3.dfsg/packages/ifpack2/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/ifpack2/src/CMakeLists.txt 2011-10-12 17:22:47.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/ifpack2/src/CMakeLists.txt 2011-12-02 14:06:38.000000000 +0100
+@@ -75,7 +75,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- ifpack2
++ trilinos_ifpack2
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+Index: trilinos-10.8.3.dfsg/packages/thyra/core/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/thyra/core/src/CMakeLists.txt 2011-10-12 17:23:51.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/thyra/core/src/CMakeLists.txt 2011-12-02 14:07:39.000000000 +0100
+@@ -86,7 +86,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- thyracore
++ trilinos_thyracore
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+Index: trilinos-10.8.3.dfsg/packages/thyra/core/test/nonlinear/models/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/thyra/core/test/nonlinear/models/CMakeLists.txt 2011-10-12 17:23:52.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/thyra/core/test/nonlinear/models/CMakeLists.txt 2011-12-02 14:07:56.000000000 +0100
+@@ -18,7 +18,7 @@
+ thyra_nonlinear_test_models
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS thyracore
++ DEPLIBS trilinos_thyracore
+ TESTONLY
+ )
+
+Index: trilinos-10.8.3.dfsg/packages/kokkos/NodeTSQR/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/NodeTSQR/CMakeLists.txt 2011-10-12 17:22:52.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/kokkos/NodeTSQR/CMakeLists.txt 2011-12-02 14:16:18.000000000 +0100
+@@ -146,10 +146,10 @@
+ ENDIF ()
+
+ PACKAGE_ADD_LIBRARY(
+- kokkosnodetsqr
++ trilinos_kokkosnodetsqr
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS kokkos
++ DEPLIBS trilinos_kokkos
+ )
+
+ # Restore original CMake module path
+Index: trilinos-10.8.3.dfsg/packages/kokkos/NodeTSQR/test/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/NodeTSQR/test/CMakeLists.txt 2011-10-12 17:22:52.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/kokkos/NodeTSQR/test/CMakeLists.txt 2011-12-02 14:14:08.000000000 +0100
+@@ -15,7 +15,7 @@
+ ARGS "--verify --testReal"
+ STANDARD_PASS_OUTPUT
+ NUM_MPI_PROCS 1
+- DEPLIBS kokkos kokkosnodetsqr
++ DEPLIBS trilinos_kokkos trilinos_kokkosnodetsqr
+ )
+
+ # Performance and accuracy test suite for TSQR::SequentialTsqr
+@@ -27,7 +27,7 @@
+ ARGS "--verify --nrows=100000 --ncols=10 --cache-block-size=50000 --contiguous-cache-blocks"
+ STANDARD_PASS_OUTPUT
+ NUM_MPI_PROCS 1
+- DEPLIBS kokkos kokkosnodetsqr
++ DEPLIBS trilinos_kokkos trilinos_kokkosnodetsqr
+ )
+
+ # This test uses LAPACK's QR factorization to get a reference for
+@@ -41,7 +41,7 @@
+ ARGS "--verify --nrows=1000 --ncols=10 --ntrials=10"
+ STANDARD_PASS_OUTPUT
+ NUM_MPI_PROCS 1
+- DEPLIBS kokkos kokkosnodetsqr
++ DEPLIBS trilinos_kokkos trilinos_kokkosnodetsqr
+ )
+
+ # Performance and accuracy test suite for TSQR::TBB::TbbTsqr
+@@ -57,7 +57,7 @@
+ ARGS "--verify --nrows=100000 --ncols=10 --cache-block-size=50000 --contiguous-cache-blocks"
+ STANDARD_PASS_OUTPUT
+ NUM_MPI_PROCS 1
+- DEPLIBS kokkos kokkosnodetsqr
++ DEPLIBS trilinos_kokkos trilinos_kokkosnodetsqr
+ )
+ ENDIF()
+
+@@ -77,6 +77,6 @@
+ ARGS "--verify --numRows=100000 --numCols=10 --numPartitions=7 --cacheSizeHint=50000 --contiguousCacheBlocks"
+ STANDARD_PASS_OUTPUT
+ NUM_MPI_PROCS 1
+- DEPLIBS kokkos kokkosnodetsqr
++ DEPLIBS trilinos_kokkos trilinos_kokkosnodetsqr
+ )
+
+Index: trilinos-10.8.3.dfsg/packages/kokkos/LinAlg/examples/PDP10/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/LinAlg/examples/PDP10/CMakeLists.txt 2011-10-12 17:22:51.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/kokkos/LinAlg/examples/PDP10/CMakeLists.txt 2011-12-02 14:18:34.000000000 +0100
+@@ -14,6 +14,6 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+ ENDIF()
+Index: trilinos-10.8.3.dfsg/packages/kokkos/LinAlg/examples/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/LinAlg/examples/CMakeLists.txt 2011-10-12 17:22:51.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/kokkos/LinAlg/examples/CMakeLists.txt 2011-12-02 14:20:13.000000000 +0100
+@@ -6,6 +6,6 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+ PACKAGE_ADD_TEST_DIRECTORIES(PDP10)
+Index: trilinos-10.8.3.dfsg/packages/kokkos/NodeAPI/examples/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/NodeAPI/examples/CMakeLists.txt 2011-10-12 17:22:51.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/kokkos/NodeAPI/examples/CMakeLists.txt 2011-12-02 14:21:44.000000000 +0100
+@@ -7,5 +7,5 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkosnodeapi
++ DEPLIBS trilinos_kokkosnodeapi
+ )
+Index: trilinos-10.8.3.dfsg/packages/belos/tpetra/test/BlockCG/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/belos/tpetra/test/BlockCG/CMakeLists.txt 2011-10-12 17:22:35.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/belos/tpetra/test/BlockCG/CMakeLists.txt 2011-12-02 14:41:48.000000000 +0100
+@@ -7,7 +7,7 @@
+ SOURCES test_bl_cg_hb.cpp
+ ARGS
+ COMM serial mpi
+- DEPLIBS tpetra
++ DEPLIBS trilinos_tpetra
+ )
+
+ #PACKAGE_ADD_EXECUTABLE_AND_TEST(
+Index: trilinos-10.8.3.dfsg/packages/kokkos/DistTSQR/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/DistTSQR/CMakeLists.txt 2011-10-12 17:22:51.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/kokkos/DistTSQR/CMakeLists.txt 2011-12-02 14:36:12.000000000 +0100
+@@ -51,10 +51,10 @@
+ ENDIF ()
+
+ PACKAGE_ADD_LIBRARY(
+- kokkosdisttsqr
++ trilinos_kokkosdisttsqr
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS kokkos kokkosnodetsqr
++ DEPLIBS trilinos_kokkos trilinos_kokkosnodetsqr
+ )
+
+ # Our tests test for both performance and numerical accuracy. They
+Index: trilinos-10.8.3.dfsg/packages/kokkos/DistTSQR/test/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/DistTSQR/test/CMakeLists.txt 2011-10-12 17:22:51.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/kokkos/DistTSQR/test/CMakeLists.txt 2011-12-02 14:36:27.000000000 +0100
+@@ -9,7 +9,7 @@
+ ARGS "--verify --ncols=5 --explicit --implicit --real"
+ STANDARD_PASS_OUTPUT
+ NUM_MPI_PROCS 1
+- DEPLIBS kokkos kokkosnodetsqr kokkosdisttsqr
++ DEPLIBS trilinos_kokkos kokkosnodetsqr kokkosdisttsqr
+ )
+
+
+@@ -23,5 +23,5 @@
+ ARGS "--numRowsLocal=100 --numCols=5 --testFactorExplicit --testReal"
+ STANDARD_PASS_OUTPUT
+ NUM_MPI_PROCS 4
+- DEPLIBS kokkos kokkosnodetsqr kokkosdisttsqr
++ DEPLIBS trilinos_kokkos trilinos_kokkosnodetsqr trilinos_kokkosdisttsqr
+ )
+Index: trilinos-10.8.3.dfsg/packages/kokkos/array/perf_test/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/array/perf_test/CMakeLists.txt 2011-10-12 17:22:50.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/kokkos/array/perf_test/CMakeLists.txt 2011-12-02 14:37:05.000000000 +0100
+@@ -12,7 +12,7 @@
+ PerfTestTPI.cpp
+ )
+ LIST(APPEND LIBRARIES
+- kokkosdevicetpi
++ trilinos_kokkosdevicetpi
+ )
+ ENDIF()
+
+@@ -21,7 +21,7 @@
+ PerfTestTBB.cpp
+ )
+ LIST( APPEND LIBRARIES
+- kokkosdevicetbb tbb
++ trilinos_kokkosdevicetbb tbb
+ )
+ ENDIF()
+
+@@ -34,7 +34,7 @@
+ PerfTestCuda.cpp
+ )
+ LIST(APPEND LIBRARIES
+- kokkosdevicecuda perf_cuda
++ trilinos_okkosdevicecuda perf_cuda
+ )
+ ENDIF()
+
+Index: trilinos-10.8.3.dfsg/packages/kokkos/array/src/DeviceHost/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/array/src/DeviceHost/CMakeLists.txt 2011-10-12 17:22:50.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/kokkos/array/src/DeviceHost/CMakeLists.txt 2011-12-02 14:37:32.000000000 +0100
+@@ -19,8 +19,8 @@
+
+
+ PACKAGE_ADD_LIBRARY(
+- kokkosdevicehost
++ trilinos_kokkosdevicehost
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS kokkos
++ DEPLIBS trilinos_kokkos
+ )
+Index: trilinos-10.8.3.dfsg/packages/kokkos/array/src/DeviceTBB/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/array/src/DeviceTBB/CMakeLists.txt 2011-10-12 17:22:50.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/kokkos/array/src/DeviceTBB/CMakeLists.txt 2011-12-02 14:37:49.000000000 +0100
+@@ -19,8 +19,8 @@
+
+
+ PACKAGE_ADD_LIBRARY(
+- kokkosdevicetbb
++ trilinos_kokkosdevicetbb
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS kokkos tbb
++ DEPLIBS trilinos_kokkos tbb
+ )
+Index: trilinos-10.8.3.dfsg/packages/kokkos/array/src/DeviceTPI/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/array/src/DeviceTPI/CMakeLists.txt 2011-10-12 17:22:50.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/kokkos/array/src/DeviceTPI/CMakeLists.txt 2011-12-02 14:37:44.000000000 +0100
+@@ -19,8 +19,8 @@
+
+
+ PACKAGE_ADD_LIBRARY(
+- kokkosdevicetpi
++ trilinos_kokkosdevicetpi
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS kokkos
++ DEPLIBS trilinos_kokkos
+ )
+Index: trilinos-10.8.3.dfsg/packages/kokkos/array/src/impl/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/kokkos/array/src/impl/CMakeLists.txt 2011-10-12 17:22:50.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/kokkos/array/src/impl/CMakeLists.txt 2011-12-02 14:37:21.000000000 +0100
+@@ -37,10 +37,10 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- kokkosimpl
++ trilinos_kokkosimpl
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS kokkos
++ DEPLIBS trilinos_kokkos
+ )
+
+ # No longer needed; Trilinos does this at the top level.
+Index: trilinos-10.8.3.dfsg/packages/optika/test/unit_tests/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/optika/test/unit_tests/CMakeLists.txt 2011-10-12 17:23:11.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/optika/test/unit_tests/CMakeLists.txt 2011-12-02 14:47:59.000000000 +0100
+@@ -45,6 +45,6 @@
+ NonGUI_UnitTests
+ SOURCES NonGUI_UnitTests.cpp
+ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
+- DEPLIBS teuchos ${TPL_QT_LIBRARIES}
++ DEPLIBS trilinos_teuchos ${TPL_QT_LIBRARIES}
+ )
+
+Index: trilinos-10.8.3.dfsg/packages/stokhos/example/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stokhos/example/CMakeLists.txt 2011-10-12 17:23:35.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/stokhos/example/CMakeLists.txt 2011-12-02 14:32:14.000000000 +0100
+@@ -6,76 +6,76 @@
+ COMM serial mpi
+ PASS_REGULAR_EXPRESSION "Example Passed"
+ NUM_MPI_PROCS 1
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ PACKAGE_ADD_EXECUTABLE(
+ exp_moment_example
+ SOURCES exp_moment_example.cpp
+ COMM serial mpi
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ PACKAGE_ADD_EXECUTABLE(
+ stieltjes_example
+ SOURCES stieltjes_example.cpp
+ COMM serial mpi
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ PACKAGE_ADD_EXECUTABLE(
+ stieltjes_example2
+ SOURCES stieltjes_example2.cpp
+ COMM serial mpi
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ PACKAGE_ADD_EXECUTABLE(
+ stieltjes_coupled_example
+ SOURCES stieltjes_coupled.cpp
+ COMM serial mpi
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ PACKAGE_ADD_EXECUTABLE(
+ gram_schmidt_example
+ SOURCES gram_schmidt_example.cpp
+ COMM serial mpi
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ PACKAGE_ADD_EXECUTABLE(
+ recurrence_example
+ SOURCES recurrence_example.cpp
+ COMM serial mpi
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ PACKAGE_ADD_EXECUTABLE(
+ random_field_example
+ SOURCES random_field_example.cpp
+ COMM serial mpi
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ PACKAGE_ADD_EXECUTABLE(
+ sparsity_example
+ SOURCES sparsity_example.cpp
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ PACKAGE_ADD_EXECUTABLE(
+ sparsity_slice_example
+ SOURCES sparsity_slice_example.cpp
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- linear2d_diffusion
++ trilinear_linear2d_diffusion
+ HEADERS twoD_diffusion_ME.hpp
+ SOURCES twoD_diffusion_ME.cpp
+ TESTONLY
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ IF(Stokhos_ENABLE_TriKota)
+@@ -86,34 +86,34 @@
+ COMM serial mpi
+ PASS_REGULAR_EXPRESSION "Example Passed"
+ NUM_MPI_PROCS 1
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ IF(Stokhos_ENABLE_AztecOO AND Stokhos_ENABLE_ML)
+
+ PACKAGE_ADD_EXECUTABLE(
+ Linear2D_Diffusion_Collocation_Example
+- SOURCES linear2d_diffusion_collocation.cpp
++ SOURCES trilinear_linear2d_diffusion_collocation.cpp
+ COMM serial mpi
+- DEPLIBS stokhos linear2d_diffusion
++ DEPLIBS trilinos_stokhos trilinear_linear2d_diffusion
+ )
+
+ IF(Stokhos_ENABLE_Stratimikos)
+
+ PACKAGE_ADD_EXECUTABLE(
+ Linear2D_Diffusion_Collocation_Strat_Example
+- SOURCES linear2d_diffusion_collocation_strat.cpp
++ SOURCES trilinear_linear2d_diffusion_collocation_strat.cpp
+ COMM serial mpi
+- DEPLIBS stokhos linear2d_diffusion
++ DEPLIBS trilinos_stokhos trilinear_linear2d_diffusion
+ )
+
+ IF(Stokhos_ENABLE_NOX)
+
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Linear2D_Diffusion_PCE_MPNI_Example
+- SOURCES linear2d_diffusion_pce_mpni.cpp
++ SOURCES trilinear_linear2d_diffusion_pce_mpni.cpp
+ COMM serial mpi
+- DEPLIBS stokhos linear2d_diffusion
++ DEPLIBS trilinos_stokhos trilinear_linear2d_diffusion
+ ARGS 1
+ NUM_MPI_PROCS 2
+ PASS_REGULAR_EXPRESSION "Example Passed!"
+@@ -129,9 +129,9 @@
+
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Linear2D_Diffusion_PCE_Example
+- SOURCES linear2d_diffusion_pce.cpp
++ SOURCES trilinear_linear2d_diffusion_pce.cpp
+ COMM serial mpi
+- DEPLIBS stokhos linear2d_diffusion
++ DEPLIBS trilinos_stokhos trilinear_linear2d_diffusion
+ ARGS 1
+ NUM_MPI_PROCS 2
+ PASS_REGULAR_EXPRESSION "Example Passed!"
+@@ -141,9 +141,9 @@
+
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Linear2D_Diffusion_PCE_NOX_Example
+- SOURCES linear2d_diffusion_pce_nox.cpp
++ SOURCES trilinear_linear2d_diffusion_pce_nox.cpp
+ COMM serial mpi
+- DEPLIBS stokhos linear2d_diffusion
++ DEPLIBS trilinos_stokhos trilinear_linear2d_diffusion
+ ARGS 1
+ NUM_MPI_PROCS 2
+ PASS_REGULAR_EXPRESSION "Example Passed!"
+@@ -152,9 +152,9 @@
+ IF(Stokhos_ENABLE_Stratimikos)
+ PACKAGE_ADD_EXECUTABLE(
+ Linear2D_Diffusion_PCE_NOX_SG_Solvers
+- SOURCES linear2d_diffusion_pce_nox_sg_solvers.cpp
++ SOURCES trilinear_linear2d_diffusion_pce_nox_sg_solvers.cpp
+ COMM serial mpi
+- DEPLIBS stokhos linear2d_diffusion
++ DEPLIBS trilinos_stokhos trilinear_linear2d_diffusion
+ )
+
+ PACKAGE_ADD_TEST(
+@@ -288,7 +288,7 @@
+ ARGS -v
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+@@ -297,7 +297,7 @@
+ ARGS -v
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ ENDIF()
+@@ -310,7 +310,7 @@
+ ARGS -v
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ ENDIF()
+@@ -323,7 +323,7 @@
+ ARGS -v
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ IF(Stokhos_ENABLE_Sacado)
+@@ -335,7 +335,7 @@
+ ARGS -v
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ ENDIF()
+Index: trilinos-10.8.3.dfsg/packages/teuchos/test/Conditions/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/teuchos/test/Conditions/CMakeLists.txt 2011-10-12 17:23:49.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/teuchos/test/Conditions/CMakeLists.txt 2011-12-02 14:48:20.000000000 +0100
+@@ -17,7 +17,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Conditions_Serialization_test
+ SOURCES cxx_main.cpp Condition_Serialization_UnitTests.cpp
+- DEPLIBS teuchos_xml_pl_test_helpers
++ DEPLIBS trilinos_teuchos_xml_pl_test_helpers
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+Index: trilinos-10.8.3.dfsg/packages/teuchos/test/Dependencies/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/teuchos/test/Dependencies/CMakeLists.txt 2011-10-12 17:23:49.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/teuchos/test/Dependencies/CMakeLists.txt 2011-12-02 14:48:29.000000000 +0100
+@@ -10,7 +10,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Dependencies_Serialization_test
+ SOURCES cxx_main.cpp Dependencies_SerializationTests.cpp
+- DEPLIBS teuchos_xml_pl_test_helpers
++ DEPLIBS trilinos_teuchos_xml_pl_test_helpers
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+Index: trilinos-10.8.3.dfsg/packages/teuchos/test/ParameterList/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/teuchos/test/ParameterList/CMakeLists.txt 2011-10-12 17:23:49.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/teuchos/test/ParameterList/CMakeLists.txt 2011-12-02 14:48:57.000000000 +0100
+@@ -4,11 +4,11 @@
+ INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
+
+ PACKAGE_ADD_LIBRARY(
+- teuchos_xml_pl_test_helpers
++ trilinos_teuchos_xml_pl_test_helpers
+ HEADERS Teuchos_XMLParameterListTestHelpers.hpp
+ SOURCES Teuchos_XMLParameterListTestHelpers.cpp
+ TESTONLY
+- DEPLIBS teuchos
++ DEPLIBS trilinos_teuchos
+ )
+
+ SET(SerializationFiles
+@@ -45,7 +45,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ ParameterList_SerializationTest
+ SOURCES ParameterList_SerializationTest.cpp Teuchos_StandardUnitTestMain.cpp
+- DEPLIBS teuchos_xml_pl_test_helpers
++ DEPLIBS trilinos_teuchos_xml_pl_test_helpers
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+Index: trilinos-10.8.3.dfsg/packages/teuchos/test/Validators/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/teuchos/test/Validators/CMakeLists.txt 2011-10-12 17:23:49.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/teuchos/test/Validators/CMakeLists.txt 2011-12-02 14:49:13.000000000 +0100
+@@ -20,7 +20,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ Validator_SerializationTest
+ SOURCES cxx_main.cpp Validator_SerializationTest.cpp
+- DEPLIBS teuchos_xml_pl_test_helpers
++ DEPLIBS trilinos_teuchos_xml_pl_test_helpers
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+Index: trilinos-10.8.3.dfsg/packages/tpetra/example/HybridPlatform/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/tpetra/example/HybridPlatform/CMakeLists.txt 2011-10-12 17:23:52.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/tpetra/example/HybridPlatform/CMakeLists.txt 2011-12-02 14:43:04.000000000 +0100
+@@ -9,7 +9,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
+@@ -60,7 +60,7 @@
+ # # ARGS
+ # COMM mpi # serial
+ # STANDARD_PASS_OUTPUT
+-# DEPLIBS tpetra ifpack2 anasazi
++# DEPLIBS trilinos_tpetra trilinos_ifpack2 trilinos_anasazi
+ # )
+ #
+ # INSTALL(TARGETS Tpetra_HybridPlatformAnasazi
+Index: trilinos-10.8.3.dfsg/packages/tpetra/example/LocalMatOps/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/tpetra/example/LocalMatOps/CMakeLists.txt 2011-10-12 17:23:52.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/tpetra/example/LocalMatOps/CMakeLists.txt 2011-12-02 14:43:17.000000000 +0100
+@@ -17,5 +17,5 @@
+ # ARGS
+ COMM mpi serial
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+Index: trilinos-10.8.3.dfsg/packages/tpetra/rti/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/tpetra/rti/CMakeLists.txt 2011-10-12 17:23:53.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/tpetra/rti/CMakeLists.txt 2011-12-02 14:44:59.000000000 +0100
+@@ -40,10 +40,10 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- tpetrarti
++ trilinos_tpetrarti
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS tpetra
++ DEPLIBS trilinos_tpetra
+ )
+
+ # PACKAGE_ADD_TEST_DIRECTORIES(test)
+Index: trilinos-10.8.3.dfsg/packages/tpetra/test/MatrixMatrix/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/tpetra/test/MatrixMatrix/CMakeLists.txt 2011-10-12 17:23:53.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/tpetra/test/MatrixMatrix/CMakeLists.txt 2011-12-02 14:43:30.000000000 +0100
+@@ -7,7 +7,7 @@
+ MatrixMatrix_UnitTests.cpp
+ ${TEUCHOS_STD_UNIT_TEST_MAIN}
+ ARGS "--matnames-file=\"matrixsystems.xml\" --v"
+- DEPLIBS tpetraext tpetrainout
++ DEPLIBS trilinos_tpetraext trilinos_tpetrainout
+ )
+
+ PACKAGE_COPY_FILES_TO_BINARY_DIR(TpetraMatMatFileCopies
+Index: trilinos-10.8.3.dfsg/packages/tpetra/test/RowMatrixTransposer/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/tpetra/test/RowMatrixTransposer/CMakeLists.txt 2011-10-12 17:23:54.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/tpetra/test/RowMatrixTransposer/CMakeLists.txt 2011-12-02 14:44:17.000000000 +0100
+@@ -12,7 +12,7 @@
+ ${TEUCHOS_STD_UNIT_TEST_MAIN}
+ COMM serial mpi
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi tpetratestlib
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi trilinos_tpetratestlib
+ )
+
+ PACKAGE_COPY_FILES_TO_BINARY_DIR(TransposeFileCopies
+Index: trilinos-10.8.3.dfsg/packages/tpetra/test/inout/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/tpetra/test/inout/CMakeLists.txt 2011-10-12 17:23:53.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/tpetra/test/inout/CMakeLists.txt 2011-12-02 14:44:42.000000000 +0100
+@@ -12,7 +12,7 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi tpetrainout tpetratestlib
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi trilinos_tpetrainout trilinos_tpetratestlib
+ )
+
+ # This test should work for any number of MPI processes, as long as
+@@ -25,5 +25,5 @@
+ ARGS ""
+ COMM serial mpi
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi tpetrainout tpetratestlib
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi trilinos_tpetrainout trilinos_tpetratestlib
+ )
+Index: trilinos-10.8.3.dfsg/packages/epetra/test/FECrsMatrix/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/epetra/test/FECrsMatrix/CMakeLists.txt 2011-10-12 17:22:39.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/epetra/test/FECrsMatrix/CMakeLists.txt 2011-12-02 14:53:33.000000000 +0100
+@@ -7,7 +7,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ FECrsMatrix_test
+ SOURCES cxx_main.cpp ExecuteTestProblems.cpp
+- DEPLIBS epetratest
++ DEPLIBS trilinos_epetratest
+ ARGS -v
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+Index: trilinos-10.8.3.dfsg/packages/epetra/test/FEVbrMatrix/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/epetra/test/FEVbrMatrix/CMakeLists.txt 2011-10-12 17:22:39.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/epetra/test/FEVbrMatrix/CMakeLists.txt 2011-12-02 14:53:17.000000000 +0100
+@@ -3,7 +3,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ FEVbrMatrix_test
+ SOURCES cxx_main.cpp ExecuteTestProblems.cpp
+- DEPLIBS epetratest
++ DEPLIBS trilinos_epetratest
+ ARGS -v
+ COMM mpi serial
+ NUM_MPI_PROCS 1
+Index: trilinos-10.8.3.dfsg/packages/epetra/test/FEVector/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/epetra/test/FEVector/CMakeLists.txt 2011-10-12 17:22:39.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/epetra/test/FEVector/CMakeLists.txt 2011-12-02 14:53:22.000000000 +0100
+@@ -5,7 +5,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ FEVector_test
+ SOURCES cxx_main.cpp ExecuteTestProblems.cpp
+- DEPLIBS epetratest
++ DEPLIBS trilinos_epetratest
+ ARGS -v
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+Index: trilinos-10.8.3.dfsg/packages/epetra/test/VbrMatrix/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/epetra/test/VbrMatrix/CMakeLists.txt 2011-10-12 17:22:40.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/epetra/test/VbrMatrix/CMakeLists.txt 2011-12-02 14:53:12.000000000 +0100
+@@ -3,7 +3,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ VbrMatrix_test
+ SOURCES cxx_main.cpp
+- DEPLIBS epetratest
++ DEPLIBS trilinos_epetratest
+ ARGS -v
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+Index: trilinos-10.8.3.dfsg/packages/epetra/test/src/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/epetra/test/src/CMakeLists.txt 2011-10-12 17:22:40.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/epetra/test/src/CMakeLists.txt 2011-12-02 14:53:28.000000000 +0100
+@@ -17,6 +17,6 @@
+ HEADERS ${TEST_HEADERS}
+ SOURCES ${TEST_SOURCES}
+ DEFINES -DEPETRA_LIB_EXPORTS_MODE
+- DEPLIBS epetra
++ DEPLIBS trilinos_epetra
+ TESTONLY
+ )
+Index: trilinos-10.8.3.dfsg/packages/fei/example/beam/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/fei/example/beam/CMakeLists.txt 2011-10-12 17:22:42.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/fei/example/beam/CMakeLists.txt 2011-12-02 14:53:51.000000000 +0100
+@@ -16,7 +16,7 @@
+ ARGS "-i beam_crs_aztecoo.i"
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS fei_test_utils
++ DEPLIBS trilinos_fei_test_utils
+ )
+
+ PACKAGE_COPY_FILES_TO_BINARY_DIR(copyexamplebeamfeifiles
+Index: trilinos-10.8.3.dfsg/packages/fei/test/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/fei/test/CMakeLists.txt 2011-10-12 17:22:43.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/fei/test/CMakeLists.txt 2011-12-02 14:53:58.000000000 +0100
+@@ -21,7 +21,7 @@
+ ARGS "-d . -test unit_tests"
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS fei_test_utils
++ DEPLIBS trilinos_fei_test_utils
+ )
+
+ IF(FEI_ENABLE_AztecOO)
+Index: trilinos-10.8.3.dfsg/packages/fei/unit_tests_base/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/fei/unit_tests_base/CMakeLists.txt 2011-10-12 17:22:44.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/fei/unit_tests_base/CMakeLists.txt 2011-12-02 14:53:40.000000000 +0100
+@@ -20,7 +20,7 @@
+ ARGS ""
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS fei_test_utils
++ DEPLIBS trilinos_fei_test_utils
+ STANDARD_PASS_OUTPUT
+ )
+
+Index: trilinos-10.8.3.dfsg/packages/ifpack2/test/belos/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/ifpack2/test/belos/CMakeLists.txt 2011-10-12 17:22:47.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/ifpack2/test/belos/CMakeLists.txt 2011-12-02 14:52:44.000000000 +0100
+@@ -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(Ifpack2_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()
+
+Index: trilinos-10.8.3.dfsg/packages/phalanx/test/Graphviz/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/phalanx/test/Graphviz/CMakeLists.txt 2011-10-12 17:23:16.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/phalanx/test/Graphviz/CMakeLists.txt 2011-12-02 14:54:22.000000000 +0100
+@@ -8,7 +8,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ graphviz
+ SOURCES Graphviz.cpp
+- DEPLIBS phalanx_test_utilities
++ DEPLIBS trilinos_phalanx_test_utilities
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ PASS_REGULAR_EXPRESSION "Test passed!"
+Index: trilinos-10.8.3.dfsg/packages/thyra/core/test/nonlinear/models/UnitTests/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/thyra/core/test/nonlinear/models/UnitTests/CMakeLists.txt 2011-10-12 17:23:52.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/thyra/core/test/nonlinear/models/UnitTests/CMakeLists.txt 2011-12-02 14:53:02.000000000 +0100
+@@ -6,7 +6,7 @@
+ SOURCES
+ Simple2DModelEvaluator_UnitTests.cpp
+ ${TEUCHOS_STD_UNIT_TEST_MAIN}
+- DEPLIBS thyra_nonlinear_test_models
++ DEPLIBS trilinos_thyra_nonlinear_test_models
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+ )
+Index: trilinos-10.8.3.dfsg/packages/Sundance/src-pdeopt/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/Sundance/src-pdeopt/CMakeLists.txt 2011-10-12 17:23:41.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/Sundance/src-pdeopt/CMakeLists.txt 2011-12-02 14:57:21.000000000 +0100
+@@ -46,8 +46,8 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- pdeopt
++ trilinos_pdeopt
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS sundanceStdFwk sundanceCore sundanceStdMesh sundanceInterop sundanceUtils playa
++ DEPLIBS trilinos_sundanceStdFwk trilinos_sundanceCore trilinos_sundanceStdMesh trilinos_sundanceInterop trilinos_sundanceUtils trilinos_playa
+ )
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_algsup/stk_algsup/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_algsup/stk_algsup/CMakeLists.txt 2011-10-12 17:23:32.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/stk/stk_algsup/stk_algsup/CMakeLists.txt 2011-12-02 15:02:25.000000000 +0100
+@@ -15,9 +15,9 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_algsup
++ trilinos_stk_algsup
+ NOINSTALLHEADERS ${HEADERS}
+- DEPLIBS stk_mesh_base
++ DEPLIBS trilinos_stk_mesh_base
+ SOURCES ${SOURCES}
+ )
+
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_io/stk_io/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_io/stk_io/CMakeLists.txt 2011-10-12 17:23:32.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/stk/stk_io/stk_io/CMakeLists.txt 2011-12-02 15:01:29.000000000 +0100
+@@ -43,9 +43,9 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_io
++ trilinos_stk_io
+ NOINSTALLHEADERS ${HEADERS}
+- DEPLIBS stk_mesh_base stk_mesh_fem
++ DEPLIBS trilinos_stk_mesh_base trilinos_stk_mesh_fem
+ SOURCES ${SOURCES}
+ )
+
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_io/stk_io/util/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_io/stk_io/util/CMakeLists.txt 2011-10-12 17:23:32.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/stk/stk_io/stk_io/util/CMakeLists.txt 2011-12-02 15:01:14.000000000 +0100
+@@ -39,10 +39,10 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_io_util
++ trilinos_stk_io_util
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS stk_io
++ DEPLIBS trilinos_stk_io
+ )
+
+ INSTALL(FILES ${HEADERS} DESTINATION
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_mesh/unit_tests/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_mesh/unit_tests/CMakeLists.txt 2011-10-12 17:23:33.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/stk/stk_mesh/unit_tests/CMakeLists.txt 2011-12-02 15:02:01.000000000 +0100
+@@ -16,7 +16,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ stk_mesh_unit_tests
+ SOURCES ${SOURCES}
+- DEPLIBS stk_util_use_cases
++ DEPLIBS trilinos_stk_util_use_cases
+ ARGS ""
+ COMM serial mpi
+ NUM_MPI_PROCS 1-4
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_mesh/use_cases/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_mesh/use_cases/CMakeLists.txt 2011-10-12 17:23:33.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/stk/stk_mesh/use_cases/CMakeLists.txt 2011-12-02 15:02:06.000000000 +0100
+@@ -22,7 +22,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ stk_mesh_use_cases
+ SOURCES ${SOURCES}
+- DEPLIBS stk_util_use_cases
++ DEPLIBS trilinos_stk_util_use_cases
+ ARGS ""
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_rebalance/use_cases/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_rebalance/use_cases/CMakeLists.txt 2011-10-12 17:23:34.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/stk/stk_rebalance/use_cases/CMakeLists.txt 2011-12-02 15:02:11.000000000 +0100
+@@ -17,7 +17,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ stk_rebalance_use_cases
+ SOURCES ${SOURCES}
+- DEPLIBS stk_util_use_cases
++ DEPLIBS trilinos_stk_util_use_cases
+ ARGS ""
+ COMM mpi
+ NUM_MPI_PROCS 1-4
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_usecases/app/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_usecases/app/CMakeLists.txt 2011-10-12 17:23:34.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/stk/stk_usecases/app/CMakeLists.txt 2011-12-02 15:02:58.000000000 +0100
+@@ -24,7 +24,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ stk_use_cases_app
+ SOURCES ${SOURCES}
+- DEPLIBS stk_io
++ DEPLIBS trilinos_stk_io
+ NAME stk_app_use_case_14
+ ARGS "--use_case_14 --mesh gen:10x10x10 --trials 30"
+ COMM serial mpi
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_usecases/io/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_usecases/io/CMakeLists.txt 2011-10-12 17:23:34.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/stk/stk_usecases/io/CMakeLists.txt 2011-12-02 15:03:03.000000000 +0100
+@@ -26,7 +26,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ stk_use_cases_io
+ SOURCES ${SOURCES}
+- DEPLIBS stk_io
++ DEPLIBS trilinos_stk_io
+ ARGS ""
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_usecases/linsys/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_usecases/linsys/CMakeLists.txt 2011-10-12 17:23:34.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/stk/stk_usecases/linsys/CMakeLists.txt 2011-12-02 15:02:41.000000000 +0100
+@@ -25,7 +25,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ stk_use_cases_linsys
+ SOURCES ${SOURCES}
+- DEPLIBS stk_linsys stk_io
++ DEPLIBS trilinos_stk_linsys trilinos_stk_io
+ ARGS "--use_case_1 --mesh gen:10x10x10+shell:y"
+ COMM serial mpi
+ NUM_MPI_PROCS 3
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_usecases/transfer/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_usecases/transfer/CMakeLists.txt 2011-10-12 17:23:34.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/stk/stk_usecases/transfer/CMakeLists.txt 2011-12-02 15:02:51.000000000 +0100
+@@ -25,7 +25,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ stk_use_cases_transfer
+ SOURCES ${SOURCES}
+- DEPLIBS stk_io stk_search stk_search_util
++ DEPLIBS trilinos_stk_io trilinos_stk_search trilinos_stk_search_util
+ NAME stk_transfer_use_case_0
+ ARGS "--pout log --dw=transfer --use_case_0 --domain_mesh \"gen:8x8x8|zdecomp:8" --range_mesh "gen:8x8x8|zdecomp:8\""
+ COMM serial mpi
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_usecases/util/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_usecases/util/CMakeLists.txt 2011-10-12 17:23:34.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/stk/stk_usecases/util/CMakeLists.txt 2011-12-02 15:02:30.000000000 +0100
+@@ -22,7 +22,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ stk_use_cases_util
+ SOURCES ${SOURCES}
+-# DEPLIBS stk_util_use_cases
++# DEPLIBS trilinos_stk_util_use_cases
+ ARGS ""
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt 2011-10-12 17:23:34.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt 2011-12-02 15:03:24.000000000 +0100
+@@ -44,9 +44,9 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_util_unit_test_support
++ trilinos_stk_util_unit_test_support
+ NOINSTALLHEADERS ${HEADERS}
+- DEPLIBS stk_io_util
++ DEPLIBS trilinos_stk_io_util
+ SOURCES ${SOURCES}
+ )
+
+Index: trilinos-10.8.3.dfsg/packages/stk/stk_util/unit_tests/CMakeLists.txt
+===================================================================
+--- trilinos-10.8.3.dfsg.orig/packages/stk/stk_util/unit_tests/CMakeLists.txt 2011-10-12 17:23:35.000000000 +0200
++++ trilinos-10.8.3.dfsg/packages/stk/stk_util/unit_tests/CMakeLists.txt 2011-12-02 15:03:12.000000000 +0100
+@@ -25,7 +25,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ util_UnitTest
+ SOURCES ${SOURCES}
+- DEPLIBS stk_util_parallel stk_util_diag
++ DEPLIBS trilinos_stk_util_parallel trilinos_stk_util_diag
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
Modified: packages/trilinos/trunk/debian/patches/soname.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/soname.patch?rev=44377&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/soname.patch (original)
+++ packages/trilinos/trunk/debian/patches/soname.patch Mon Jan 16 07:58:21 2012
@@ -1,10 +1,10 @@
-Index: trilinos-10.6.1.dfsg/cmake/package_arch/PackageLibraryMacros.cmake
+Index: trilinos-10.8.2.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})
+--- trilinos-10.8.2.dfsg.orig/cmake/package_arch/PackageLibraryMacros.cmake 2011-10-07 21:27:28.000000000 +0200
++++ trilinos-10.8.2.dfsg/cmake/package_arch/PackageLibraryMacros.cmake 2011-10-13 13:59:47.000000000 +0200
+@@ -255,6 +255,12 @@
+ SET_PROPERTY(TARGET ${LIBRARY_NAME} APPEND PROPERTY
+ LABELS ${PACKAGE_NAME})
+ # Apply user-defined properties to the library target.
+ IF(Trilinos_LIBRARY_PROPERTIES)
@@ -12,6 +12,6 @@
+ ${Trilinos_LIBRARY_PROPERTIES})
+ ENDIF(Trilinos_LIBRARY_PROPERTIES)
+
- PREPEND_GLOBAL_SET(${PACKAGE_NAME}_LIB_TARGETS ${LIBRARY_NAME})
- PREPEND_GLOBAL_SET(${PACKAGE_NAME}_ALL_TARGETS ${LIBRARY_NAME})
-
+ PREPEND_GLOBAL_SET(${PACKAGE_NAME}_LIB_TARGETS ${LIBRARY_NAME})
+ PREPEND_GLOBAL_SET(${PACKAGE_NAME}_ALL_TARGETS ${LIBRARY_NAME})
+
Modified: packages/trilinos/trunk/debian/patches/trilinosversion.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/trilinosversion.patch?rev=44377&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/trilinosversion.patch (original)
+++ packages/trilinos/trunk/debian/patches/trilinosversion.patch Mon Jan 16 07:58:21 2012
@@ -1,15 +1,16 @@
-Index: trilinos-10.6.1.dfsg/cmake/TrilinosVersion.cmake
+Index: trilinos-10.8.2.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.6.1")
+--- trilinos-10.8.2.dfsg.orig/cmake/TrilinosVersion.cmake 2011-10-12 11:07:59.000000000 +0200
++++ trilinos-10.8.2.dfsg/cmake/TrilinosVersion.cmake 2011-10-12 11:08:07.000000000 +0200
+@@ -61,6 +61,7 @@
+
+ SET(Trilinos_VERSION "10.8.3")
SET(Trilinos_MAJOR_VERSION "10")
-+SET(Trilinos_MINOR_VERSION "6")
- SET(Trilinos_MAJOR_MINOR_VERSION "100601")
- SET(Trilinos_VERSION_STRING "10.6.1")
-
-@@ -11,3 +12,13 @@
++SET(Trilinos_MINOR_VERSION "8")
+ SET(Trilinos_MAJOR_MINOR_VERSION "100803")
+ SET(Trilinos_VERSION_STRING "10.8.3")
+ SET(Trilinos_ENABLE_DEVELOPMENT_MODE_DEFAULT OFF) # Change to 'OFF' for a release
+@@ -72,3 +73,13 @@
SET(TRILINOS_MAJOR_VERSION TRUE)
SET(TRILINOS_MAJOR_MINOR_VERSION TRUE)
SET(TRILINOS_VERSION_STRING TRUE)
Added: packages/trilinos/trunk/debian/python-pytrilinos.install
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/python-pytrilinos.install?rev=44377&op=file
==============================================================================
--- packages/trilinos/trunk/debian/python-pytrilinos.install (added)
+++ packages/trilinos/trunk/debian/python-pytrilinos.install Mon Jan 16 07:58:21 2012
@@ -1,0 +1,1 @@
+debian/tmp/usr/lib/python*/*-packages/PyTrilinos
Modified: packages/trilinos/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/rules?rev=44377&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/rules (original)
+++ packages/trilinos/trunk/debian/rules Mon Jan 16 07:58:21 2012
@@ -1,17 +1,8 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
-# This file is public domain.
+BUILDDIR = $(CURDIR)/debian/build
-DEB_AUTO_CLEANUP_RCS := yes
-DEB_BUILDDIR := $(DEB_SRCDIR)/
-DEB_MAKE_CLEAN_TARGET := clean
-DEB_COMPRESS_EXCLUDE := .pdf
-PYVER = $(shell pyversions -dv)
TRILINOS_HOME = $(CURDIR)/$(DEB_SRCDIR)
-
-include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+PYVERS := $(shell pyversions -vr debian/control)
export CC=/usr/bin/mpicc
export CXX=/usr/bin/mpic++
@@ -22,35 +13,82 @@
version=1.0
version_major=1
-DEB_CMAKE_EXTRA_FLAGS= \
+
+%:
+ dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR)
+
+extra_flags += \
-D Trilinos_ENABLE_ALL_PACKAGES:BOOL=ON \
+ -D Trilinos_ENABLE_SECONDARY_STABLE_CODE=OFF \
-D Trilinos_ENABLE_PyTrilinos:BOOL=ON \
+ -D Trilinos_ENABLE_TriKota:BOOL=OFF \
-D Trilinos_ENABLE_TESTS:BOOL=OFF \
-D Trilinos_ENABLE_EXAMPLES:BOOL=OFF \
-D CMAKE_BUILD_TYPE:STRING=DEBUG \
-D BUILD_SHARED_LIBS:BOOL=ON \
-D Trilinos_INSTALL_INCLUDE_DIR:PATH=include/trilinos \
-D TPL_ENABLE_MPI:BOOL=ON \
+ -D TPL_ENABLE_MATLAB:BOOL=OFF \
-DNOX_ENABLE_LAPACK:BOOL=ON \
$(TRILINOS_HOME)
-clean::
+override_dh_auto_clean:
+ dh_quilt_unpatch
-find $(CURDIR) -name "*.pyc" | xargs rm -f
-find $(CURDIR) -name "Makefile.orig" | xargs rm -f
+ for v in $(PYVERS); do \
+ rm -rf $(BUILDDIR)$$v; \
+ done
+
+ -rm packages/stk/stk_percept/stk_percept/sparsehash/config.status
+ -rm -rf SIERRA/bjam
-install/python-pytrilinos::
- if [ $(PYVER) = "2.6" ]; then \
- dh_install -ppython-pytrilinos -X.pyc \
- debian/tmp/usr/lib/python$(PYVER)/site-packages/PyTrilinos \
- usr/lib/python$(PYVER)/dist-packages; \
- else \
- dh_install -ppython-pytrilinos -X.pyc \
- debian/tmp/usr/lib/python$(PYVER)/site-packages/PyTrilinos \
- usr/lib/python$(PYVER)/site-packages; \
- fi
- dh_pycentral -ppython-pytrilinos
+ # retreive backup copy of files to enable rebuild
+ -mv -f cmake/python/data/CDashSubprojectDependencies.xml.bck cmake/python/data/CDashSubprojectDependencies.xml
+ -mv -f cmake/python/data/TrilinosPackageDependencies.xml.bck cmake/python/data/TrilinosPackageDependencies.xml
+ -mv -f cmake/python/data/TrilinosPackageDependenciesTable.html.bck cmake/python/data/TrilinosPackageDependenciesTable.html
+ -mv -f packages/nox/doc/Doxyfile.bck packages/nox/doc/Doxyfile
-install/libtrilinos-doc::
+override_dh_auto_configure:
+
+ # create a backup copy of files to enable rebuild
+ -cp cmake/python/data/CDashSubprojectDependencies.xml cmake/python/data/CDashSubprojectDependencies.xml.bck
+ -cp cmake/python/data/TrilinosPackageDependencies.xml cmake/python/data/TrilinosPackageDependencies.xml.bck
+ -cp cmake/python/data/TrilinosPackageDependenciesTable.html cmake/python/data/TrilinosPackageDependenciesTable.html.bck
+ -cp packages/nox/doc/Doxyfile packages/nox/doc/Doxyfile.bck
+
+ dh_quilt_patch
+ for v in $(PYVERS); do \
+ dh_auto_configure --builddirectory=$(BUILDDIR)$$v \
+ -- $(extra_flags) \
+ -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/python$$v ;\
+ done
+
+override_dh_auto_build:
+ for v in $(PYVERS); do \
+ dh_auto_build --builddirectory=$(BUILDDIR)$$v; \
+ done
+
+override_dh_auto_install:
+ for v in $(PYVERS); do \
+ dh_auto_install --builddirectory=$(BUILDDIR)$$v; \
+ done
+
+ #install/python-pytrilinos::
+ for v in $(PYVER); do \
+ if [ $(PYVER) = "2.6" ]; then \
+ dh_install -ppython-pytrilinos -X.pyc \
+ debian/tmp/usr/lib/python$$v/site-packages/PyTrilinos \
+ usr/lib/python$$v/site-packages; \
+ else \
+ dh_install -ppython-pytrilinos -X.pyc \
+ debian/tmp/usr/lib/python$$v/site-packages/PyTrilinos \
+ usr/lib/python$$v/site-packages; \
+ fi \
+ done
+ dh_python2 -ppython-pytrilinos
+
+ #install/libtrilinos-doc::
-chmod -x packages/didasko/doc/DoxyfileWeb
DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
@@ -68,7 +106,6 @@
rm -f "$$TMPDIR"/packages/didasko/src/Trilinos90Tutorial.pdf; \
rm -f "$$TMPDIR"/packages/amesos/doc/AmesosReferenceGuide/AmesosReferenceGuide.pdf; \
rm -f "$$TMPDIR"/packages/ml/doc/mlguide.pdf; \
- rm -f "$$TMPDIR"/packages/ml/doc/mlguide.pdf; \
GZIP=-9 tar -czf \
$(CURDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig ; \
Added: packages/trilinos/trunk/debian/source/format
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/source/format?rev=44377&op=file
==============================================================================
--- packages/trilinos/trunk/debian/source/format (added)
+++ packages/trilinos/trunk/debian/source/format Mon Jan 16 07:58:21 2012
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the debian-science-commits
mailing list