r44480 - in /packages/trilinos/trunk/debian: changelog control libtrilinos-dev.install patches/libname.patch patches/series patches/soname.patch rules
johannr-guest at users.alioth.debian.org
johannr-guest at users.alioth.debian.org
Mon Feb 13 10:28:47 UTC 2012
Author: johannr-guest
Date: Mon Feb 13 10:28:46 2012
New Revision: 44480
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44480
Log:
Work on Trilinos.
Modified:
packages/trilinos/trunk/debian/changelog
packages/trilinos/trunk/debian/control
packages/trilinos/trunk/debian/libtrilinos-dev.install
packages/trilinos/trunk/debian/patches/libname.patch
packages/trilinos/trunk/debian/patches/series
packages/trilinos/trunk/debian/patches/soname.patch
packages/trilinos/trunk/debian/rules
Modified: packages/trilinos/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/changelog?rev=44480&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/changelog (original)
+++ packages/trilinos/trunk/debian/changelog Mon Feb 13 10:28:46 2012
@@ -1,8 +1,25 @@
-trilinos (10.8.3.dfsg-1.1) unstable; urgency=low
+trilinos (10.8.5.dfsg-1) UNRELEASED; urgency=low
+ [Christophe Trophime]
* Non-maintainer upload.
- * New upstream release (closes: #625027)
+ * New upstream release. This release fixes several bugs:
+ - "trilinos: FTBFS: Teuchos_ConfigDefs.hpp:128:9: error:
+ 'ptrdiff_t' does not name a type" (closes: #625027).
+ - "ftbfs with gcc-4.5" (closes #565053).
+ - "libtrilinos-dev: Sacado_cmath.hpp redefines cmath functions"
+ (closes: #637352).
* debian/control: update Standard-Version to 3.9.2
+ * Switch to dpkg-source 3.0 (quilt) format.
+ * Move from dh_pycentral to dh_python2 (closes: #617133).
+ * Move to swig2.0 (closes: #630936).
+ * Drop CDBS.
+
+ [Johannes Ring]
+ * Update patches.
+ * debian/libtrilinos-dev.install: Install CMake files.
+ * debian/control:
+ - Replace libopenmpi-dev with mpi-default-dev in Build-Depends.
+ - Add mpi-default-bin to Build-Depends.
-- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Fri, 02 Dec 2011 10:55:54 +0200
Modified: packages/trilinos/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/control?rev=44480&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/control (original)
+++ packages/trilinos/trunk/debian/control Mon Feb 13 10:28:46 2012
@@ -3,9 +3,9 @@
Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: 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
+Build-Depends: quilt (>=0.46-7), debhelper (>= 7.0.50~), cmake, gfortran,
+ mpi-default-dev, mpi-default-bin, 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/
Modified: packages/trilinos/trunk/debian/libtrilinos-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/libtrilinos-dev.install?rev=44480&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/libtrilinos-dev.install (original)
+++ packages/trilinos/trunk/debian/libtrilinos-dev.install Mon Feb 13 10:28:46 2012
@@ -1,2 +1,3 @@
debian/tmp/usr/lib/libtrilinos*.so
debian/tmp/usr/include/trilinos
+debian/tmp/usr/lib/cmake
Modified: packages/trilinos/trunk/debian/patches/libname.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/libname.patch?rev=44480&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/libname.patch (original)
+++ packages/trilinos/trunk/debian/patches/libname.patch Mon Feb 13 10:28:46 2012
@@ -1,7 +1,19 @@
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/cmake/config_tests/fmangle/CMakeLists.txt trilinos-10.8.5.dfsg/cmake/config_tests/fmangle/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/cmake/config_tests/fmangle/CMakeLists.txt 2012-01-09 18:08:07.000000000 +0100
++++ trilinos-10.8.5.dfsg/cmake/config_tests/fmangle/CMakeLists.txt 2012-02-06 15:00:28.594986547 +0100
+@@ -2,6 +2,6 @@
+ PROJECT(fmangle C Fortran)
+ ADD_DEFINITIONS(${COMMON_DEFS})
+ SET(CMAKE_VERBOSE_MAKEFILE ON)
+-ADD_LIBRARY(fmangle fmangle.f)
+-ADD_EXECUTABLE(cmangle cmangle.c)
+-TARGET_LINK_LIBRARIES(cmangle fmangle)
++ADD_LIBRARY(trilinos_fmangle fmangle.f)
++ADD_EXECUTABLE(trilinos_cmangle cmangle.c)
++TARGET_LINK_LIBRARIES(trilinos_cmangle trilinos_fmangle)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/amesos/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/amesos/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/amesos/src/CMakeLists.txt 2012-01-09 18:07:09.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/amesos/src/CMakeLists.txt 2012-02-06 13:03:19.251235177 +0100
@@ -465,7 +465,7 @@
#
@@ -11,10 +23,21 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/amesos2/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/amesos2/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/amesos2/src/CMakeLists.txt 2012-01-09 18:06:16.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/amesos2/src/CMakeLists.txt 2012-02-06 14:55:48.342996460 +0100
+@@ -230,7 +230,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- amesos2
++ trilinos_amesos2
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/anasazi/epetra/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/anasazi/epetra/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/anasazi/epetra/src/CMakeLists.txt 2012-01-09 18:05:19.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/anasazi/epetra/src/CMakeLists.txt 2012-02-06 13:03:19.251235177 +0100
@@ -45,9 +45,9 @@
#
@@ -27,10 +50,9 @@
+ DEPLIBS trilinos_anasazi
DEFINES -DANASAZIEPETRA_LIB_EXPORTS_MODE
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt trilinos-10.8.5.dfsg/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt 2012-01-09 18:05:20.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/anasazi/epetra/util/ModeLaplace/CMakeLists.txt 2012-02-06 13:03:19.251235177 +0100
@@ -62,9 +62,9 @@
#
@@ -43,10 +65,9 @@
+ DEPLIBS trilinos_anasazi
DEFINES -DANASAZIEPETRA_MODELAPLACE_LIB_EXPORTS_MODE
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/anasazi/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/anasazi/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/anasazi/src/CMakeLists.txt 2012-01-09 18:05:20.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/anasazi/src/CMakeLists.txt 2012-02-06 13:03:19.255235177 +0100
@@ -169,7 +169,7 @@
#
@@ -56,10 +77,189 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
DEFINES -DANASAZI_LIB_EXPORTS_MODE
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/anasazi/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/anasazi/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/anasazi/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/anasazi/src/CMakeLists.txt.orig 2012-02-06 12:48:02.191267614 +0100
+@@ -0,0 +1,176 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++# Enabling a define if the Thyra Epetra adapter is defined.
++ASSERT_DEFINED(Anasazi_ENABLE_ThyraEpetraAdapters)
++IF(Anasazi_ENABLE_ThyraEpetraAdapters)
++ SET(HAVE_EPETRA_THYRA 1)
++ENDIF()
++
++IF(Anasazi_ENABLE_ThyraCore)
++ SET(HAVE_ANASAZI_THYRA 1)
++ENDIF()
++
++ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_TSQR)
++IF(${PACKAGE_NAME}_ENABLE_TSQR)
++ SET(HAVE_ANASAZI_TSQR 1)
++ENDIF()
++
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++SET(CURRENT_PACKAGE ANASAZI)
++CONFIGURE_FILE("${TRILINOS_HOME_DIR}/packages/Trilinos_DLLExportMacro.h.in"
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_DLLExportMacro.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_DLLExportMacro.h
++ )
++
++#
++# Core Files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++APPEND_SET(HEADERS
++ AnasaziBasicEigenproblem.hpp
++ AnasaziBasicOrthoManager.hpp
++ AnasaziBasicOutputManager.hpp
++ AnasaziBasicSort.hpp
++ AnasaziBlockDavidson.hpp
++ AnasaziBlockDavidsonSolMgr.hpp
++ AnasaziBlockKrylovSchur.hpp
++ AnasaziBlockKrylovSchurSolMgr.hpp
++ AnasaziConfigDefs.hpp
++ AnasaziEigenproblem.hpp
++ AnasaziEigensolver.hpp
++ AnasaziEigensolverDecl.hpp
++ AnasaziLOBPCG.hpp
++ AnasaziLOBPCGSolMgr.hpp
++ AnasaziGenOrthoManager.hpp
++ AnasaziHelperTraits.hpp
++ AnasaziICGSOrthoManager.hpp
++ AnasaziIRTR.hpp
++ AnasaziMatOrthoManager.hpp
++ AnasaziMultiVec.hpp
++ AnasaziMultiVecTraits.hpp
++ AnasaziOperator.hpp
++ AnasaziOperatorTraits.hpp
++ AnasaziOrthoManager.hpp
++ AnasaziOutputManager.hpp
++ AnasaziRTRBase.hpp
++ AnasaziRTRSolMgr.hpp
++ AnasaziSimpleLOBPCGSolMgr.hpp
++ AnasaziSIRTR.hpp
++ AnasaziSolverManager.hpp
++ AnasaziSortManager.hpp
++ AnasaziSolverUtils.hpp
++ AnasaziStatusTest.hpp
++ AnasaziStatusTestDecl.hpp
++ AnasaziStatusTestCombo.hpp
++ AnasaziStatusTestMaxIters.hpp
++ AnasaziStatusTestWithOrdering.hpp
++ AnasaziStatusTestOutput.hpp
++ AnasaziStatusTestResNorm.hpp
++ AnasaziSVQBOrthoManager.hpp
++ AnasaziTypes.hpp
++ )
++
++APPEND_SET(SOURCES
++ AnasaziVersion.cpp
++ )
++
++#
++# Util Files
++#
++
++APPEND_SET(HEADERS
++ AnasaziMVOPTester.hpp
++ )
++
++
++#
++# Comp Files
++#
++
++APPEND_SET(HEADERS
++ AnasaziBlockDavidson.hpp
++ AnasaziBlockKrylovSchur.hpp
++ AnasaziLOBPCG.hpp
++ AnasaziRTRBase.hpp
++ AnasaziIRTR.hpp
++ AnasaziSIRTR.hpp
++ AnasaziBlockDavidsonSolMgr.hpp
++ AnasaziBlockKrylovSchurSolMgr.hpp
++ AnasaziLOBPCGSolMgr.hpp
++ AnasaziSimpleLOBPCGSolMgr.hpp
++ AnasaziRTRSolMgr.hpp
++ )
++
++ASSERT_DEFINED(Anasazi_ENABLE_ThyraCore)
++IF (Anasazi_ENABLE_ThyraCore)
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../thyra/src)
++ APPEND_SET(HEADERS
++ ../thyra/src/AnasaziThyraAdapter.hpp
++ ../thyra/src/AnasaziThyraDebugAdapter.hpp
++ )
++ENDIF()
++
++ASSERT_DEFINED(Anasazi_ENABLE_Tpetra)
++IF (Anasazi_ENABLE_Tpetra)
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../tpetra/src)
++ APPEND_SET(HEADERS
++ ../tpetra/src/AnasaziTpetraAdapter.hpp
++ )
++ENDIF()
++
++IF (TPL_ENABLE_MPI)
++
++ENDIF()
++
++
++######################################################################
++## BEGIN TSQR setup
++######################################################################
++
++ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_TSQR)
++IF(${PACKAGE_NAME}_ENABLE_TSQR)
++ #
++ # Build the TSQR-based OrthoManager and MatOrthoManager classes.
++ #
++ APPEND_SET(HEADERS AnasaziTsqrOrthoManagerImpl.hpp)
++ APPEND_SET(HEADERS AnasaziTsqrOrthoManager.hpp)
++ENDIF() # ${PACKAGE_NAME}_ENABLE_TSQR
++
++######################################################################
++## END TSQR setup
++######################################################################
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ anasazi
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ DEFINES -DANASAZI_LIB_EXPORTS_MODE
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/anasazi/thyra/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/anasazi/thyra/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/anasazi/thyra/src/CMakeLists.txt 2012-01-09 18:05:18.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/anasazi/thyra/src/CMakeLists.txt 2012-02-06 13:03:19.255235177 +0100
@@ -111,7 +111,7 @@
#
@@ -69,10 +269,34 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/anasazi/tpetra/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/anasazi/tpetra/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/anasazi/tpetra/src/CMakeLists.txt 2012-01-09 18:05:21.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/anasazi/tpetra/src/CMakeLists.txt 2012-02-06 13:08:03.843225111 +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 ()
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/aztecoo/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/aztecoo/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/aztecoo/src/CMakeLists.txt 2012-01-09 18:04:22.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/aztecoo/src/CMakeLists.txt 2012-02-06 13:03:19.255235177 +0100
@@ -173,7 +173,7 @@
#
@@ -82,10 +306,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/belos/epetra/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/belos/epetra/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/belos/epetra/src/CMakeLists.txt 2012-01-09 18:06:18.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/belos/epetra/src/CMakeLists.txt 2012-02-06 14:34:42.719041226 +0100
@@ -46,16 +46,16 @@
# is a hack to avoid an optional package dependency of Epetra on
# Teuchos and Kokkos.
@@ -107,10 +330,9 @@
+ 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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/belos/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/belos/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/belos/src/CMakeLists.txt 2012-01-09 18:06:24.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/belos/src/CMakeLists.txt 2012-02-06 14:23:39.955064668 +0100
@@ -145,14 +145,14 @@
# the appropriate Kokkos libraries, since TSQR is implemented in
# Kokkos.
@@ -129,10 +351,9 @@
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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/belos/tpetra/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/belos/tpetra/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/belos/tpetra/src/CMakeLists.txt 2012-01-09 18:06:25.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/belos/tpetra/src/CMakeLists.txt 2012-02-06 14:24:00.627063937 +0100
@@ -40,16 +40,16 @@
#
IF (${PACKAGE_NAME}_ENABLE_TSQR)
@@ -154,10 +375,21 @@
+ 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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/belos/tpetra/test/BlockCG/CMakeLists.txt trilinos-10.8.5.dfsg/packages/belos/tpetra/test/BlockCG/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/belos/tpetra/test/BlockCG/CMakeLists.txt 2012-01-09 18:06:25.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/belos/tpetra/test/BlockCG/CMakeLists.txt 2012-02-06 15:22:21.866940097 +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(
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/CTrilinos/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/CTrilinos/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/CTrilinos/src/CMakeLists.txt 2012-01-09 18:06:13.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/CTrilinos/src/CMakeLists.txt 2012-02-06 13:03:19.255235177 +0100
@@ -121,7 +121,7 @@
#
@@ -167,10 +399,140 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/CTrilinos/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/CTrilinos/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/CTrilinos/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/CTrilinos/src/CMakeLists.txt.orig 2012-02-06 12:48:01.671267632 +0100
+@@ -0,0 +1,127 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++#
++# B) Define the header and source files (and include directories)
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++SET_AND_INC_DIRS(DIREPETRA ${CMAKE_CURRENT_SOURCE_DIR}/epetra)
++SET_AND_INC_DIRS(DIRTEUCHOS ${CMAKE_CURRENT_SOURCE_DIR}/teuchos)
++SET_AND_INC_DIRS(DIRAMESOS ${CMAKE_CURRENT_SOURCE_DIR}/amesos)
++SET_AND_INC_DIRS(DIRAZTECOO ${CMAKE_CURRENT_SOURCE_DIR}/aztecoo)
++SET_AND_INC_DIRS(DIRGALERI ${CMAKE_CURRENT_SOURCE_DIR}/galeri)
++SET_AND_INC_DIRS(DIRIFPACK ${CMAKE_CURRENT_SOURCE_DIR}/ifpack)
++SET_AND_INC_DIRS(DIRPLIRIS ${CMAKE_CURRENT_SOURCE_DIR}/pliris)
++
++# Set the base Trilinos directory in order to find Trilinos_version.h
++
++ASSERT_DEFINED(PROJECT_SOURCE_DIR)
++
++INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR})
++
++APPEND_SET(HEADERS
++ ${CMAKE_CURRENT_BINARY_DIR}/../../../Trilinos_version.h
++ )
++
++# Set headers (for IDEs and installing)
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++APPEND_SET(HEADERS
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
++ )
++
++# NOTE: Above, we add the XXX_config.h file so tht MS Visual Studio
++# will know to include this file in the dependency analysis
++
++# Set sources and headers
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++APPEND_SET(HEADERS
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_Version.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_enums.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_flex_enums.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_table_man.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_external_utils.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_enum_wrappers.h
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_exceptions.hpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_utils.hpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_utils_templ.hpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_test_utils.hpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_Table.hpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_TableRepos.hpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_difficult.hpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/CNOX_Interface.hpp
++ )
++
++APPEND_SET(SOURCES
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_TableRepos.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_utils.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_test_utils.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_table_man.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_external_utils.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/CTrilinos_difficult.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/CNOX_Interface.cpp
++ ${CMAKE_CURRENT_SOURCE_DIR}/CNOX_Driver.cpp
++ )
++
++APPEND_GLOB(HEADERS ${DIREPETRA}/*.hpp ${DIREPETRA}/*.h
++ ${DIRTEUCHOS}/*.hpp ${DIRTEUCHOS}/*.h)
++APPEND_GLOB(SOURCES ${DIREPETRA}/*.cpp ${DIRTEUCHOS}/*.cpp)
++
++IF (${PACKAGE_NAME}_ENABLE_Amesos)
++
++ APPEND_GLOB(HEADERS ${DIRAMESOS}/*.hpp ${DIRAMESOS}/*.h)
++ APPEND_GLOB(SOURCES ${DIRAMESOS}/*.cpp)
++
++ENDIF()
++
++IF (${PACKAGE_NAME}_ENABLE_AztecOO)
++
++ APPEND_GLOB(HEADERS ${DIRAZTECOO}/*.hpp ${DIRAZTECOO}/*.h)
++ APPEND_GLOB(SOURCES ${DIRAZTECOO}/*.cpp)
++
++ENDIF()
++
++IF (${PACKAGE_NAME}_ENABLE_Galeri)
++
++ APPEND_GLOB(HEADERS ${DIRGALERI}/*.hpp ${DIRGALERI}/*.h)
++ APPEND_GLOB(SOURCES ${DIRGALERI}/*.cpp)
++
++ENDIF()
++
++IF (${PACKAGE_NAME}_ENABLE_Ifpack)
++
++ APPEND_GLOB(HEADERS ${DIRIFPACK}/*.hpp ${DIRIFPACK}/*.h)
++ APPEND_GLOB(SOURCES ${DIRIFPACK}/*.cpp)
++
++ENDIF()
++
++IF (${PACKAGE_NAME}_ENABLE_Pliris)
++ IF (TPL_ENABLE_MPI)
++
++ APPEND_GLOB(HEADERS ${DIRPLIRIS}/*.hpp ${DIRPLIRIS}/*.h)
++ APPEND_GLOB(SOURCES ${DIRPLIRIS}/*.cpp)
++
++ ENDIF()
++ENDIF()
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ ctrilinos
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/epetra/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/epetra/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/epetra/src/CMakeLists.txt 2012-01-09 18:04:25.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/epetra/src/CMakeLists.txt 2012-02-06 13:03:19.255235177 +0100
@@ -210,7 +210,7 @@
#
@@ -180,10 +542,294 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
DEFINES -DEPETRA_LIB_EXPORTS_MODE
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/epetra/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/epetra/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/epetra/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/epetra/src/CMakeLists.txt.orig 2012-02-06 12:48:01.959267622 +0100
+@@ -0,0 +1,217 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++SET(EPETRA_MPI ${TPL_ENABLE_MPI})
++IF(CMAKE_SIZEOF_VOID_P GREATER 4)
++ SET(EPETRA_ADDRESS64BIT ON)
++ENDIF()
++SET(Epetra_HAVE_OMP ${Trilinos_ENABLE_OpenMP})
++# This is the preferred macro to key on, but am keeping the old one for backward compatibility
++SET(EPETRA_HAVE_OMP ${Trilinos_ENABLE_OpenMP})
++
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++SET(CURRENT_PACKAGE EPETRA)
++CONFIGURE_FILE("${TRILINOS_HOME_DIR}/packages/Trilinos_DLLExportMacro.h.in"
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_DLLExportMacro.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_DLLExportMacro.h
++ )
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++SET(HEADERS ${HEADERS}
++ Epetra_BLAS.h
++ Epetra_BLAS_wrappers.h
++ Epetra_BasicDirectory.h
++ Epetra_BasicRowMatrix.h
++ Epetra_BlockMap.h
++ Epetra_BlockMapData.h
++ Epetra_C_wrappers.h
++ Epetra_CombineMode.h
++ Epetra_Comm.h
++ Epetra_CompObject.h
++ Epetra_ConfigDefs.h
++ Epetra_CrsGraph.h
++ Epetra_CrsGraphData.h
++ Epetra_CrsMatrix.h
++ Epetra_CrsSingletonFilter.h
++ Epetra_Data.h
++ Epetra_DataAccess.h
++ Epetra_Directory.h
++ Epetra_DistObject.h
++ Epetra_Distributor.h
++ Epetra_Export.h
++ Epetra_FECrsGraph.h
++ Epetra_FECrsMatrix.h
++ Epetra_FEVbrMatrix.h
++ Epetra_FEVector.h
++# Epetra_FastCrsMatrix.h
++ Epetra_Flops.h
++ Epetra_Fortran_wrappers.h
++ Epetra_HashTable.h
++ Epetra_Import.h
++ Epetra_IntSerialDenseMatrix.h
++ Epetra_IntSerialDenseVector.h
++ Epetra_IntVector.h
++ Epetra_InvOperator.h
++ Epetra_JadMatrix.h
++ Epetra_LAPACK.h
++ Epetra_LAPACK_wrappers.h
++ Epetra_LinearProblem.h
++# Epetra_LinearProblemRedistor.h
++ Epetra_LocalMap.h
++ Epetra_Map.h
++ Epetra_MapColoring.h
++ Epetra_MultiVector.h
++ Epetra_Object.h
++ Epetra_OffsetIndex.h
++ Epetra_Operator.h
++ Epetra_RowMatrix.h
++ Epetra_RowMatrixTransposer.h
++ Epetra_SerialComm.h
++ Epetra_SerialCommData.h
++ Epetra_SerialDenseMatrix.h
++ Epetra_SerialDenseOperator.h
++ Epetra_SerialDenseSVD.h
++ Epetra_SerialDenseSolver.h
++ Epetra_SerialDenseVector.h
++ Epetra_SerialDistributor.h
++ Epetra_SerialSpdDenseSolver.h
++ Epetra_SerialSymDenseMatrix.h
++ Epetra_SrcDistObject.h
++ Epetra_Time.h
++ Epetra_Util.h
++ Epetra_VbrMatrix.h
++ Epetra_VbrRowMatrix.h
++ Epetra_Vector.h
++ Epetra_Version.h
++ )
++
++# Set sources
++SET(SOURCES ${SOURCES}
++ Epetra_BLAS.cpp
++ Epetra_BasicDirectory.cpp
++ Epetra_BasicRowMatrix.cpp
++ Epetra_BlockMap.cpp
++ Epetra_BlockMapData.cpp
++ Epetra_C_wrappers.cpp
++ Epetra_CompObject.cpp
++ Epetra_CrsGraph.cpp
++ Epetra_CrsGraphData.cpp
++ Epetra_CrsMatrix.cpp
++ Epetra_CrsSingletonFilter.cpp
++ Epetra_Data.cpp
++ Epetra_DistObject.cpp
++ Epetra_Export.cpp
++ Epetra_FECrsGraph.cpp
++ Epetra_FECrsMatrix.cpp
++ Epetra_FEVbrMatrix.cpp
++ Epetra_FEVector.cpp
++# Epetra_FastCrsMatrix.cpp
++ Epetra_Flops.cpp
++ Epetra_Fortran_wrappers.cpp
++ Epetra_Import.cpp
++ Epetra_IntSerialDenseMatrix.cpp
++ Epetra_IntSerialDenseVector.cpp
++ Epetra_IntVector.cpp
++# Epetra_InvOperator.cpp
++ Epetra_JadMatrix.cpp
++ Epetra_LAPACK.cpp
++ Epetra_LinearProblem.cpp
++# Epetra_LinearProblemRedistor.cpp
++ Epetra_LocalMap.cpp
++ Epetra_Map.cpp
++ Epetra_MapColoring.cpp
++ Epetra_MultiVector.cpp
++ Epetra_Object.cpp
++ Epetra_OffsetIndex.cpp
++ Epetra_RowMatrixTransposer.cpp
++ Epetra_SerialComm.cpp
++ Epetra_SerialCommData.cpp
++ Epetra_SerialDenseMatrix.cpp
++ Epetra_SerialDenseSVD.cpp
++ Epetra_SerialDenseSolver.cpp
++ Epetra_SerialDenseVector.cpp
++ Epetra_SerialDistributor.cpp
++ Epetra_SerialSpdDenseSolver.cpp
++ Epetra_SerialSymDenseMatrix.cpp
++ Epetra_Time.cpp
++ Epetra_Util.cpp
++ Epetra_VbrMatrix.cpp
++ Epetra_Vector.cpp
++ )
++
++IF(Epetra_ENABLE_Oski)
++ APPEND_SET(HEADERS
++ Epetra_OskiUtils.h
++ Epetra_OskiMultiVector.h
++ Epetra_OskiVector.h
++ Epetra_OskiError.h
++ Epetra_OskiPermutation.h
++ Epetra_OskiMatrix.h
++ )
++
++ APPEND_SET(SOURCES
++ Epetra_OskiUtils.cpp
++ Epetra_OskiMultiVector.cpp
++ Epetra_OskiVector.cpp
++ Epetra_OskiError.cpp
++ Epetra_OskiPermutation.cpp
++ Epetra_OskiMatrix.cpp
++ )
++ENDIF()
++
++IF(${PACKAGE_NAME}_ENABLE_Fortran)
++ SET(SOURCES ${SOURCES}
++ Epetra_dcrsmm.f
++ Epetra_dcrsmv.f
++ Epetra_dcrssm.f
++ Epetra_dcrssv.f
++ )
++ENDIF()
++
++# Set addition headers and source based on package-specific
++# configuration options
++
++IF(TPL_ENABLE_MPI)
++
++ SET(HEADERS ${HEADERS}
++ Epetra_MpiComm.h
++ Epetra_MpiCommData.h
++ Epetra_MpiDistributor.h
++ )
++
++ SET(SOURCES ${SOURCES}
++ Epetra_MpiComm.cpp
++ Epetra_MpiCommData.cpp
++ Epetra_MpiDistributor.cpp
++ )
++
++ENDIF()
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ epetra
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ DEFINES -DEPETRA_LIB_EXPORTS_MODE
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/epetra/test/FECrsMatrix/CMakeLists.txt trilinos-10.8.5.dfsg/packages/epetra/test/FECrsMatrix/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/epetra/test/FECrsMatrix/CMakeLists.txt 2012-01-09 18:04:25.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/epetra/test/FECrsMatrix/CMakeLists.txt 2012-02-06 15:28:17.126927531 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/epetra/test/FEVbrMatrix/CMakeLists.txt trilinos-10.8.5.dfsg/packages/epetra/test/FEVbrMatrix/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/epetra/test/FEVbrMatrix/CMakeLists.txt 2012-01-09 18:04:25.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/epetra/test/FEVbrMatrix/CMakeLists.txt 2012-02-06 15:28:12.826927683 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/epetra/test/FEVector/CMakeLists.txt trilinos-10.8.5.dfsg/packages/epetra/test/FEVector/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/epetra/test/FEVector/CMakeLists.txt 2012-01-09 18:04:25.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/epetra/test/FEVector/CMakeLists.txt 2012-02-06 15:28:27.578927163 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/epetra/test/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/epetra/test/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/epetra/test/src/CMakeLists.txt 2012-01-09 18:04:25.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/epetra/test/src/CMakeLists.txt 2012-02-06 14:36:50.831036694 +0100
+@@ -13,10 +13,10 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- epetratest
++ trilinos_epetratest
+ HEADERS ${TEST_HEADERS}
+ SOURCES ${TEST_SOURCES}
+ DEFINES -DEPETRA_LIB_EXPORTS_MODE
+- DEPLIBS epetra
++ DEPLIBS trilinos_epetra
+ TESTONLY
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/epetra/test/VbrMatrix/CMakeLists.txt trilinos-10.8.5.dfsg/packages/epetra/test/VbrMatrix/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/epetra/test/VbrMatrix/CMakeLists.txt 2012-01-09 18:04:25.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/epetra/test/VbrMatrix/CMakeLists.txt 2012-02-06 15:28:24.086927286 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/epetraext/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/epetraext/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/epetraext/src/CMakeLists.txt 2012-01-09 18:05:52.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/epetraext/src/CMakeLists.txt 2012-02-06 13:03:19.255235177 +0100
@@ -432,7 +432,7 @@
#
@@ -193,10 +839,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/fei/base/CMakeLists.txt trilinos-10.8.5.dfsg/packages/fei/base/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/fei/base/CMakeLists.txt 2012-01-09 18:07:56.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/fei/base/CMakeLists.txt 2012-02-06 13:03:19.255235177 +0100
@@ -243,7 +243,7 @@
#
@@ -206,10 +851,274 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/fei/base/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/fei/base/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/fei/base/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/fei/base/CMakeLists.txt.orig 2012-02-06 12:48:01.879267625 +0100
+@@ -0,0 +1,249 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../)
++
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
++ )
++
++#
++# Core headers
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++APPEND_SET(HEADERS
++../fei_fwd.hpp
++../fei_base.hpp
++fei_ArrayUtils.hpp
++fei_BlockDescriptor.hpp
++fei_BlockLinearProblemManager.hpp
++fei_bool.h
++fei_chk_mpi.hpp
++fei_CommMap.hpp
++fei_CommUtils.hpp
++fei_ConnectivityBlock.hpp
++fei_ConnectivityTable.hpp
++fei_console_ostream.hpp
++fei_constants.hpp
++fei_CSRMat.hpp
++fei_CSVec.hpp
++fei_ctg_set.hpp
++fei_Data.hpp
++fei_defs.h
++fei_DirichletBCManager.hpp
++fei_DirichletBCRecord.hpp
++fei_Dof.hpp
++fei_DofMapper.hpp
++fei_EqnBuffer.hpp
++fei_EqnComm.hpp
++fei_EqnCommMgr.hpp
++fei_EqnRecord.hpp
++fei_ErrMacros.hpp
++fei_Factory.hpp
++fei_FEDataFilter.hpp
++fei_FEI_Impl.hpp
++fei_FieldDofMap.hpp
++fei_FieldMask.hpp
++fei_FillableMat.hpp
++fei_FillableVec.hpp
++fei_Filter.hpp
++fei_FiniteElementData.hpp
++fei_fstream.hpp
++fei_Graph.hpp
++fei_Graph_Impl.hpp
++fei_GraphReducer.hpp
++FEI.hpp
++FEI_Implementation.hpp
++fei_impl_utils.hpp
++fei_IndexTable.hpp
++fei_iosfwd.hpp
++fei_iostream.hpp
++fei_LibraryWrapper.hpp
++fei_LinearDecomposition.hpp
++fei_LinearProblemManager.hpp
++fei_LinearSystemCore.hpp
++fei_LinearSystem.hpp
++fei_LinSysCoreFilter.hpp
++fei_LinSysCore_flexible.hpp
++fei_LogFile.hpp
++fei_Logger.hpp
++fei_LogManager.hpp
++fei_Lookup.hpp
++fei_Lookup_Impl.hpp
++fei_macros.hpp
++fei_Matrix_core.hpp
++fei_MatrixGraph.hpp
++fei_MatrixGraph_Impl2.hpp
++fei_Matrix.hpp
++fei_Matrix_Impl.hpp
++fei_Matrix_Local.hpp
++fei_MatrixReducer.hpp
++fei_MatrixTraits_FEData.hpp
++fei_MatrixTraits_FillableMat.hpp
++fei_MatrixTraits.hpp
++fei_MatrixTraits_LinProbMgr.hpp
++fei_MatrixTraits_LinSysCore.hpp
++fei_mpi.h
++fei_mpiTraits.hpp
++fei_NodeCommMgr.hpp
++fei_NodeDatabase.hpp
++fei_NodeDescriptor.hpp
++fei_ostream_ops.hpp
++fei_ParameterSet.hpp
++fei_Param.hpp
++fei_Pattern.hpp
++fei_Pool_alloc.hpp
++fei_Pool.hpp
++fei_ProcEqns.hpp
++fei_Record.hpp
++fei_Reducer.hpp
++fei_ReverseMapper.hpp
++fei_set_dof_mappings.hpp
++fei_set_shared_ids.hpp
++fei_SharedIDs.hpp
++fei_SharedPtr.hpp
++fei_SlaveVariable.hpp
++fei_Solver.hpp
++fei_SparseRowGraph.hpp
++fei_sstream.hpp
++fei_TemplateUtils.hpp
++fei_utils.hpp
++fei_Vector_core.hpp
++fei_Vector.hpp
++fei_Vector_Impl.hpp
++fei_Vector_Local.hpp
++fei_VectorReducer.hpp
++fei_VectorSpace.hpp
++fei_VectorTraits_FEData.hpp
++fei_VectorTraits_FillableVec.hpp
++fei_VectorTraits.hpp
++fei_VectorTraits_LinProbMgr.hpp
++fei_VectorTraits_LinSysCore.hpp
++fei_version.h
++snl_fei_BlkSizeMsgHandler.hpp
++snl_fei_BlockMatrixTraits.hpp
++snl_fei_Broker_FEData.hpp
++snl_fei_Broker.hpp
++snl_fei_Broker_LinSysCore.hpp
++snl_fei_Constraint.hpp
++snl_fei_Factory.hpp
++snl_fei_FEMatrixTraits_FED.hpp
++snl_fei_FEMatrixTraits.hpp
++snl_fei_FEVectorTraits_FED.hpp
++snl_fei_FEVectorTraits.hpp
++snl_fei_LinearSystem_FEData.hpp
++snl_fei_LinearSystem_General.hpp
++snl_fei_MapContig.hpp
++snl_fei_MapTraits.hpp
++snl_fei_MapTraits_specialize.hpp
++snl_fei_PointBlockMap.hpp
++snl_fei_RaggedTable.hpp
++snl_fei_RaggedTable_specialize.hpp
++snl_fei_RecordCollection.hpp
++snl_fei_RecordMsgHandler.hpp
++snl_fei_SetTraits.hpp
++snl_fei_SetTraits_specialize.hpp
++SNL_FEI_Structure.hpp
++snl_fei_SubdMsgHandler.hpp
++snl_fei_Utils.hpp
++ )
++
++APPEND_SET(SOURCES
++fei_BlockDescriptor.cpp
++fei_CommUtils.cpp
++fei_ConnectivityBlock.cpp
++fei_CSRMat.cpp
++fei_CSVec.cpp
++fei_console_ostream.cpp
++fei_DirichletBCManager.cpp
++fei_EqnBuffer.cpp
++fei_EqnComm.cpp
++fei_EqnCommMgr.cpp
++fei_Factory.cpp
++fei_FEDataFilter.cpp
++fei_FEI_Impl.cpp
++fei_FieldMask.cpp
++fei_FillableMat.cpp
++fei_FillableVec.cpp
++fei_Filter.cpp
++fei_Graph_Impl.cpp
++fei_GraphReducer.cpp
++FEI_Implementation.cpp
++fei_impl_utils.cpp
++fei_LibraryWrapper.cpp
++fei_LinearSystem.cpp
++fei_LinSysCoreFilter.cpp
++fei_LogFile.cpp
++fei_Logger.cpp
++fei_LogManager.cpp
++fei_Lookup_Impl.cpp
++fei_Matrix_core.cpp
++fei_MatrixGraph_Impl2.cpp
++fei_Matrix_Local.cpp
++fei_MatrixReducer.cpp
++fei_NodeCommMgr.cpp
++fei_NodeDatabase.cpp
++fei_NodeDescriptor.cpp
++fei_ostream_ops.cpp
++fei_Param.cpp
++fei_ParameterSet.cpp
++fei_Pattern.cpp
++fei_Pool_alloc.cpp
++fei_Pool.cpp
++fei_ProcEqns.cpp
++fei_Reducer.cpp
++fei_ReverseMapper.cpp
++fei_set_shared_ids.cpp
++fei_Solver.cpp
++fei_utils.cpp
++fei_Vector_core.cpp
++fei_Vector_Local.cpp
++fei_VectorReducer.cpp
++fei_VectorSpace.cpp
++snl_fei_BlkSizeMsgHandler.cpp
++snl_fei_Broker_FEData.cpp
++snl_fei_Broker_LinSysCore.cpp
++snl_fei_Factory.cpp
++snl_fei_LinearSystem_FEData.cpp
++snl_fei_LinearSystem_General.cpp
++snl_fei_PointBlockMap.cpp
++snl_fei_RaggedTable_specialize.cpp
++snl_fei_RecordCollection.cpp
++snl_fei_RecordMsgHandler.cpp
++SNL_FEI_Structure.cpp
++snl_fei_SubdMsgHandler.cpp
++snl_fei_Utils.cpp
++ )
++
++IF (TPL_ENABLE_MPI)
++ENDIF()
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ fei_base
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/fei/example/beam/CMakeLists.txt trilinos-10.8.5.dfsg/packages/fei/example/beam/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/fei/example/beam/CMakeLists.txt 2012-01-09 18:07:56.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/fei/example/beam/CMakeLists.txt 2012-02-06 15:31:07.606921501 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/fei/support-Trilinos/CMakeLists.txt trilinos-10.8.5.dfsg/packages/fei/support-Trilinos/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/fei/support-Trilinos/CMakeLists.txt 2012-01-09 18:07:59.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/fei/support-Trilinos/CMakeLists.txt 2012-02-06 13:03:19.259235177 +0100
@@ -75,8 +75,8 @@
#
@@ -221,10 +1130,21 @@
- DEPLIBS fei_base
+ DEPLIBS trilinos_fei_base
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/fei/test/CMakeLists.txt trilinos-10.8.5.dfsg/packages/fei/test/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/fei/test/CMakeLists.txt 2012-01-09 18:07:58.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/fei/test/CMakeLists.txt 2012-02-06 15:31:03.414921649 +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)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/fei/test_utils/CMakeLists.txt trilinos-10.8.5.dfsg/packages/fei/test_utils/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/fei/test_utils/CMakeLists.txt 2012-01-09 18:07:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/fei/test_utils/CMakeLists.txt 2012-02-06 14:42:45.579024147 +0100
@@ -135,9 +135,9 @@
#
@@ -237,10 +1157,40 @@
+ DEPLIBS trilinos_fei_base trilinos_fei_trilinos
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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/fei/unit_tests_base/CMakeLists.txt trilinos-10.8.5.dfsg/packages/fei/unit_tests_base/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/fei/unit_tests_base/CMakeLists.txt 2012-01-09 18:07:59.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/fei/unit_tests_base/CMakeLists.txt 2012-02-06 15:31:21.782920999 +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
+ )
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/ForTrilinos/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/ForTrilinos/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/ForTrilinos/src/CMakeLists.txt 2012-01-09 18:04:14.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/ForTrilinos/src/CMakeLists.txt 2012-02-06 14:43:23.003022823 +0100
+@@ -167,7 +167,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- fortrilinos
++ trilinos_fortrilinos
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+@@ -178,5 +178,5 @@
+
+ #INSTALL (EXPORT DESTINATION ${Trilinos_INSTALL_INCLUDE_DIR})
+
+-SET_TARGET_PROPERTIES(fortrilinos PROPERTIES LINKER_LANGUAGE Fortran)
++SET_TARGET_PROPERTIES(trilinos_fortrilinos PROPERTIES LINKER_LANGUAGE Fortran)
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/galeri/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/galeri/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/galeri/src/CMakeLists.txt 2012-01-09 18:04:23.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/galeri/src/CMakeLists.txt 2012-02-06 13:03:19.259235177 +0100
@@ -146,7 +146,7 @@
#
@@ -250,10 +1200,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/globipack/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/globipack/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/globipack/src/CMakeLists.txt 2012-01-09 18:05:26.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/globipack/src/CMakeLists.txt 2012-02-06 13:03:19.259235177 +0100
@@ -29,7 +29,7 @@
#
@@ -263,10 +1212,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/globipack/test/CMakeLists.txt trilinos-10.8.5.dfsg/packages/globipack/test/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/globipack/test/CMakeLists.txt 2012-01-09 18:05:26.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/globipack/test/CMakeLists.txt 2012-02-06 13:03:19.259235177 +0100
@@ -23,7 +23,7 @@
SOURCES
ArmijoPolyInterpLineSearch_UnitTests.cpp
@@ -303,10 +1251,75 @@
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/globipack/test/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/globipack/test/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/globipack/test/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/globipack/test/CMakeLists.txt.orig 2012-02-06 12:48:01.707267631 +0100
+@@ -0,0 +1,62 @@
++INCLUDE(PackageAddExecutableAndTest)
++
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_BINARY_DIR}/meritfuncs)
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/meritfuncs)
++
++
++PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ VersionUnitTests
++ SOURCES
++ VersionUnitTests.cpp
++ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
++ NUM_MPI_PROCS 1
++ STANDARD_PASS_OUTPUT
++ )
++
++
++ADD_SUBDIRECTORY(meritfuncs)
++
++
++PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ ArmijoPolyInterpLineSearch_UnitTests
++ SOURCES
++ ArmijoPolyInterpLineSearch_UnitTests.cpp
++ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
++ DEPLIBS globipack_test_meritfuncs
++ NUM_MPI_PROCS 1
++ STANDARD_PASS_OUTPUT
++ )
++
++
++PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ GoldenQuadInterpBracket_UnitTests
++ SOURCES
++ GoldenQuadInterpBracket_UnitTests.cpp
++ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
++ DEPLIBS globipack_test_meritfuncs
++ NUM_MPI_PROCS 1
++ STANDARD_PASS_OUTPUT
++ )
++
++
++PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Brents1DMinimization_UnitTests
++ SOURCES
++ Brents1DMinimization_UnitTests.cpp
++ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
++ DEPLIBS globipack_test_meritfuncs
++ NUM_MPI_PROCS 1
++ STANDARD_PASS_OUTPUT
++ )
++
++
++PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ BrentsLineSearch_UnitTests
++ SOURCES
++ BrentsLineSearch_UnitTests.cpp
++ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
++ DEPLIBS globipack_test_meritfuncs
++ NUM_MPI_PROCS 1
++ STANDARD_PASS_OUTPUT
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/globipack/test/meritfuncs/CMakeLists.txt trilinos-10.8.5.dfsg/packages/globipack/test/meritfuncs/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/globipack/test/meritfuncs/CMakeLists.txt 2012-01-09 18:05:26.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/globipack/test/meritfuncs/CMakeLists.txt 2012-02-06 13:03:19.259235177 +0100
@@ -14,11 +14,11 @@
APPEND_GLOB(HEADERS ${DIR}/*.hpp)
@@ -321,10 +1334,9 @@
)
ADD_SUBDIRECTORY(UnitTests)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt trilinos-10.8.5.dfsg/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt 2012-01-09 18:05:26.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/globipack/test/meritfuncs/UnitTests/CMakeLists.txt 2012-02-06 13:03:19.259235177 +0100
@@ -6,7 +6,7 @@
SOURCES
TestLagrPolyMeritFunc1D_UnitTests.cpp
@@ -334,10 +1346,9 @@
COMM serial mpi
NUM_MPI_PROCS 1
STANDARD_PASS_OUTPUT
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/ifpack/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/ifpack/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/ifpack/src/CMakeLists.txt 2012-01-09 18:06:47.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/ifpack/src/CMakeLists.txt 2012-02-06 13:03:19.259235177 +0100
@@ -232,7 +232,7 @@
#
@@ -347,10 +1358,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/ifpack/test/AztecOO/CMakeLists.txt trilinos-10.8.5.dfsg/packages/ifpack/test/AztecOO/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/ifpack/test/AztecOO/CMakeLists.txt 2012-01-09 18:06:47.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/ifpack/test/AztecOO/CMakeLists.txt 2012-02-06 13:03:19.259235177 +0100
@@ -17,7 +17,7 @@
PACKAGE_ADD_EXECUTABLE(
ifp_aztecoo
@@ -360,16 +1370,58 @@
)
PACKAGE_COPY_FILES_TO_BINARY_DIR(IfpackAztecOOCopyFiles
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/ifpack2/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/ifpack2/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/ifpack2/src/CMakeLists.txt 2012-01-09 18:06:15.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/ifpack2/src/CMakeLists.txt 2012-02-06 14:20:39.427071053 +0100
+@@ -75,7 +75,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- ifpack2
++ trilinos_ifpack2
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/ifpack2/test/belos/CMakeLists.txt trilinos-10.8.5.dfsg/packages/ifpack2/test/belos/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/ifpack2/test/belos/CMakeLists.txt 2012-01-09 18:06:15.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/ifpack2/test/belos/CMakeLists.txt 2012-02-06 15:20:24.218944258 +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()
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/ifpack2/test/unit_tests/CMakeLists.txt trilinos-10.8.5.dfsg/packages/ifpack2/test/unit_tests/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/ifpack2/test/unit_tests/CMakeLists.txt 2012-01-09 18:06:15.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/ifpack2/test/unit_tests/CMakeLists.txt 2012-02-06 15:20:30.474944035 +0100
+@@ -40,6 +40,6 @@
+ ARGS ""
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+- DEPLIBS tpetra kokkos teuchos
++ DEPLIBS trilinos_tpetra trilinos_kokkos trilinos_teuchos
+ )
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/intrepid/example/Drivers/CMakeLists.txt trilinos-10.8.5.dfsg/packages/intrepid/example/Drivers/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/intrepid/example/Drivers/CMakeLists.txt 2012-01-09 18:06:52.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/intrepid/example/Drivers/CMakeLists.txt 2012-02-06 15:30:58.182921833 +0100
@@ -4,7 +4,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_01
SOURCES example_01.cpp
- DEPLIBS epetra epetraext
-+ DEPLIBS trilinos_epetra epetraext
++ DEPLIBS trilinos_epetra trilinos_epetraext
ARGS "10 10 10 0 1.0 10.0 0.0 1.0 -1.0 1.0 -1.0 1.0"
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "TEST PASSED"
@@ -508,10 +1560,170 @@
# ARGS "1 10 10 10"
# NUM_MPI_PROCS 1
# PASS_REGULAR_EXPRESSION "TEST PASSED"
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/intrepid/example/Drivers/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/intrepid/example/Drivers/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/intrepid/example/Drivers/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/intrepid/example/Drivers/CMakeLists.txt.orig 2012-02-06 12:48:01.883267625 +0100
+@@ -0,0 +1,157 @@
++INCLUDE(PackageAddExecutableAndTest)
++
++IF(Trilinos_ENABLE_Epetra AND Trilinos_ENABLE_EpetraExt)
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_01
++ SOURCES example_01.cpp
++ DEPLIBS epetra epetraext
++ ARGS "10 10 10 0 1.0 10.0 0.0 1.0 -1.0 1.0 -1.0 1.0"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ XHOSTTYPE AIX
++ )
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_02
++ SOURCES example_02.cpp
++ DEPLIBS epetra epetraext
++ ARGS "10 10 10 0 1.0 1.0 -1.0 1.0 -1.0 1.0 -1.0 1.0"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ XHOSTTYPE AIX
++ )
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_03
++ SOURCES example_03.cpp
++ DEPLIBS epetra epetraext
++ ARGS "10 10 10"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ XHOSTTYPE AIX
++ )
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_04
++ SOURCES example_04.cpp
++ DEPLIBS epetra epetraext
++ ARGS "1 1"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ )
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_05
++ SOURCES example_05.cpp
++ DEPLIBS epetra epetraext
++ ARGS "1 10 10"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ )
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_06
++ SOURCES example_06.cpp
++ DEPLIBS epetra epetraext
++ ARGS "1 10 10"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ )
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_07
++ SOURCES example_07.cpp
++ DEPLIBS epetra epetraext
++ ARGS "1 10 10"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ )
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_08
++ SOURCES example_08.cpp
++ DEPLIBS epetra epetraext
++ ARGS "1 10 10"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ )
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_09
++ SOURCES example_09.cpp
++ DEPLIBS epetra epetraext
++ ARGS "1 10 10"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ )
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_10
++ SOURCES example_10.cpp
++ DEPLIBS epetra epetraext
++ ARGS "1 10 10 10"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ XHOSTTYPE AIX
++ )
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_11
++ SOURCES example_11.cpp
++ DEPLIBS epetra epetraext
++ ARGS "1 10 10 10"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ XHOSTTYPE AIX
++ )
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_12
++ SOURCES example_12.cpp
++ DEPLIBS epetra epetraext
++ ARGS "1 10 10 10"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ XHOSTTYPE AIX
++ )
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_13
++ SOURCES example_13.cpp
++ DEPLIBS epetra epetraext
++ ARGS "1 10 10 10"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ XHOSTTYPE AIX
++ )
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_14
++ SOURCES example_14.cpp
++ DEPLIBS epetra epetraext
++ ARGS "1 10 10 10"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ XHOSTTYPE AIX
++ )
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ Example_15
++ SOURCES example_15.cpp
++ DEPLIBS epetra epetraext
++ ARGS "1 10 10 10"
++ NUM_MPI_PROCS 1
++ PASS_REGULAR_EXPRESSION "TEST PASSED"
++ ADD_DIR_TO_NAME
++ XHOSTTYPE AIX
++ )
++# PACKAGE_ADD_EXECUTABLE_AND_TEST(
++# Example_16
++# SOURCES example_16.cpp
++# DEPLIBS epetra epetraext
++# ARGS "1 10 10 10"
++# NUM_MPI_PROCS 1
++# PASS_REGULAR_EXPRESSION "TEST PASSED"
++# ADD_DIR_TO_NAME
++# )
++ENDIF()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/intrepid/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/intrepid/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/intrepid/src/CMakeLists.txt 2012-01-09 18:06:53.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/intrepid/src/CMakeLists.txt 2012-02-06 13:03:19.263235177 +0100
@@ -214,7 +214,7 @@
#
@@ -521,10 +1733,233 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/intrepid/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/intrepid/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/intrepid/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/intrepid/src/CMakeLists.txt.orig 2012-02-06 12:48:01.891267624 +0100
+@@ -0,0 +1,220 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++APPEND_SET(HEADERS
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
++ )
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++#
++# All headers
++#
++
++APPEND_SET(HEADERS
++ Intrepid_ConfigDefs.hpp
++ )
++
++#
++# Shared headers
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Shared)
++APPEND_SET(HEADERS
++ Shared/Intrepid_ArrayToolsDefCloneScale.hpp
++ Shared/Intrepid_ArrayToolsDefContractions.hpp
++ Shared/Intrepid_ArrayToolsDefDot.hpp
++ Shared/Intrepid_ArrayToolsDefScalar.hpp
++ Shared/Intrepid_ArrayToolsDefTensor.hpp
++ Shared/Intrepid_ArrayTools.hpp
++ Shared/Intrepid_BurkardtRules.hpp
++ Shared/Intrepid_BurkardtRulesDef.hpp
++ Shared/Intrepid_FieldContainerDef.hpp
++ Shared/Intrepid_FieldContainer.hpp
++ Shared/Intrepid_PointToolsDef.hpp
++ Shared/Intrepid_PointTools.hpp
++ Shared/Intrepid_PolylibDef.hpp
++ Shared/Intrepid_Polylib.hpp
++ Shared/Intrepid_RealSpaceToolsDef.hpp
++ Shared/Intrepid_RealSpaceTools.hpp
++ Shared/Intrepid_Types.hpp
++ Shared/Intrepid_Utils.hpp
++ )
++
++#
++# Discretization headers
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/Integration)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/FunctionSpaceTools)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Discretization/Basis)
++APPEND_SET(HEADERS
++ Discretization/Integration/Intrepid_AdaptiveSparseGridInterfaceDef.hpp
++ Discretization/Integration/Intrepid_AdaptiveSparseGridInterface.hpp
++ Discretization/Integration/Intrepid_AdaptiveSparseGridDef.hpp
++ Discretization/Integration/Intrepid_AdaptiveSparseGrid.hpp
++ Discretization/Integration/Intrepid_Cubature.hpp
++ Discretization/Integration/Intrepid_CubatureDirectDef.hpp
++ Discretization/Integration/Intrepid_CubatureDirect.hpp
++ Discretization/Integration/Intrepid_CubatureDirectLineGaussDef.hpp
++ Discretization/Integration/Intrepid_CubatureDirectLineGauss.hpp
++ Discretization/Integration/Intrepid_CubatureDirectTetDefaultDef.hpp
++ Discretization/Integration/Intrepid_CubatureDirectTetDefault.hpp
++ Discretization/Integration/Intrepid_CubatureDirectTriDefaultDef.hpp
++ Discretization/Integration/Intrepid_CubatureDirectTriDefault.hpp
++ Discretization/Integration/Intrepid_CubatureCompositeTetDef.hpp
++ Discretization/Integration/Intrepid_CubatureCompositeTet.hpp
++ Discretization/Integration/Intrepid_CubatureGenSparseDef.hpp
++ Discretization/Integration/Intrepid_CubatureGenSparse.hpp
++ Discretization/Integration/Intrepid_CubatureLineSortedDef.hpp
++ Discretization/Integration/Intrepid_CubatureLineSorted.hpp
++ Discretization/Integration/Intrepid_CubatureSparseDef.hpp
++ Discretization/Integration/Intrepid_CubatureSparse.hpp
++ Discretization/Integration/Intrepid_CubatureSparseHelper.hpp
++ Discretization/Integration/Intrepid_CubatureTensorDef.hpp
++ Discretization/Integration/Intrepid_CubatureTensor.hpp
++ Discretization/Integration/Intrepid_CubatureTensorSortedDef.hpp
++ Discretization/Integration/Intrepid_CubatureTensorSorted.hpp
++ Discretization/Integration/Intrepid_CubaturePolylib.hpp
++ Discretization/Integration/Intrepid_CubaturePolylibDef.hpp
++ Discretization/Integration/Intrepid_DefaultCubatureFactoryDef.hpp
++ Discretization/Integration/Intrepid_DefaultCubatureFactory.hpp
++ Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceToolsDef.hpp
++ Discretization/FunctionSpaceTools/Intrepid_FunctionSpaceTools.hpp
++ Discretization/Basis/Intrepid_BasisDef.hpp
++ Discretization/Basis/Intrepid_Basis.hpp
++ Discretization/Basis/Intrepid_HGRAD_HEX_C1_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_HEX_C1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_HEX_C2_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_HEX_C2_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_HEX_Cn_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_HEX_Cn_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_LINE_C1_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_LINE_C1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM_JACOBI.hpp
++ Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM_JACOBIDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_LINE_Cn_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_QUAD_C1_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_QUAD_C1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_QUAD_C2_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_QUAD_C2_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_QUAD_Cn_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_QUAD_Cn_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_TET_C1_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_TET_C1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_TET_C2_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_TET_C2_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_TET_COMP12_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_TET_COMP12_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_TRI_C1_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_TRI_C1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_TRI_C2_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_TRI_C2_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_WEDGE_C1_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_WEDGE_C1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_WEDGE_C2_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_WEDGE_C2_FEMDef.hpp
++ Discretization/Basis/Intrepid_HCURL_HEX_I1_FEM.hpp
++ Discretization/Basis/Intrepid_HCURL_HEX_I1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HCURL_HEX_In_FEM.hpp
++ Discretization/Basis/Intrepid_HCURL_HEX_In_FEMDef.hpp
++ Discretization/Basis/Intrepid_HCURL_TET_I1_FEM.hpp
++ Discretization/Basis/Intrepid_HCURL_TET_I1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HCURL_WEDGE_I1_FEM.hpp
++ Discretization/Basis/Intrepid_HCURL_WEDGE_I1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HCURL_TRI_I1_FEM.hpp
++ Discretization/Basis/Intrepid_HCURL_TRI_I1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HCURL_QUAD_I1_FEM.hpp
++ Discretization/Basis/Intrepid_HCURL_QUAD_I1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HCURL_QUAD_In_FEM.hpp
++ Discretization/Basis/Intrepid_HCURL_QUAD_In_FEMDef.hpp
++ Discretization/Basis/Intrepid_HDIV_HEX_I1_FEM.hpp
++ Discretization/Basis/Intrepid_HDIV_HEX_I1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HDIV_HEX_In_FEM.hpp
++ Discretization/Basis/Intrepid_HDIV_HEX_In_FEMDef.hpp
++ Discretization/Basis/Intrepid_HDIV_TET_I1_FEM.hpp
++ Discretization/Basis/Intrepid_HDIV_TET_I1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HDIV_TRI_I1_FEM.hpp
++ Discretization/Basis/Intrepid_HDIV_TRI_I1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HDIV_QUAD_I1_FEM.hpp
++ Discretization/Basis/Intrepid_HDIV_QUAD_I1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HDIV_QUAD_In_FEM.hpp
++ Discretization/Basis/Intrepid_HDIV_QUAD_In_FEMDef.hpp
++ Discretization/Basis/Intrepid_HDIV_WEDGE_I1_FEM.hpp
++ Discretization/Basis/Intrepid_HDIV_WEDGE_I1_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM_ORTH.hpp
++ Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM_ORTHDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM_ORTH.hpp
++ Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM_ORTHDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_TRI_Cn_FEMDef.hpp
++ Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEM.hpp
++ Discretization/Basis/Intrepid_HGRAD_TET_Cn_FEMDef.hpp
++ Discretization/Basis/Intrepid_HDIV_TRI_In_FEM.hpp
++ Discretization/Basis/Intrepid_HDIV_TRI_In_FEMDef.hpp
++ Discretization/Basis/Intrepid_HDIV_TET_In_FEM.hpp
++ Discretization/Basis/Intrepid_HDIV_TET_In_FEMDef.hpp
++ Discretization/Basis/Intrepid_HCURL_TRI_In_FEM.hpp
++ Discretization/Basis/Intrepid_HCURL_TRI_In_FEMDef.hpp
++ Discretization/Basis/Intrepid_HCURL_TET_In_FEM.hpp
++ Discretization/Basis/Intrepid_HCURL_TET_In_FEMDef.hpp
++ Discretization/Basis/Intrepid_OrthogonalBases.hpp
++ Discretization/Basis/Intrepid_OrthogonalBasesDef.hpp
++ Discretization/Basis/Intrepid_ProductTopology.hpp
++ Discretization/Basis/Intrepid_ProductTopologyDef.hpp
++ Discretization/Basis/Intrepid_TensorBasis.hpp
++ )
++
++#
++# Cell headers
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Cell)
++APPEND_SET(HEADERS
++ Cell/Intrepid_CellTools.hpp
++ Cell/Intrepid_CellToolsDef.hpp
++ )
++
++#
++# All sources
++#
++
++APPEND_SET(SOURCES
++ Intrepid_Version.cpp
++ Shared/Intrepid_Utils.cpp
++ )
++
++
++IF (TPL_ENABLE_MPI)
++ENDIF()
++
++
++#
++# C) Define the targets for package's library(s)
++#
++
++ PACKAGE_ADD_LIBRARY(
++ intrepid
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/isorropia/example/CMakeLists.txt trilinos-10.8.5.dfsg/packages/isorropia/example/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/isorropia/example/CMakeLists.txt 2012-01-09 18:06:09.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/isorropia/example/CMakeLists.txt 2012-02-06 15:11:31.006963117 +0100
@@ -8,48 +8,48 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
matrix_1
@@ -582,10 +2017,68 @@
+ 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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/isorropia/example/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/isorropia/example/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/isorropia/example/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/isorropia/example/CMakeLists.txt.orig 2012-02-06 12:48:02.123267616 +0100
+@@ -0,0 +1,55 @@
++
++INCLUDE(PackageAddExecutableAndTest)
++
++
++ADD_SUBDIRECTORY(geometric)
++
++
++PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ matrix_1
++ SOURCES matrix_1.cpp
++ DEPLIBS isorropia_test_utils
++ COMM serial mpi
++ )
++PACKAGE_ADD_EXECUTABLE(
++ graphedge_weights
++ SOURCES graphedge_weights.cpp
++ DEPLIBS isorropia_test_utils
++ COMM serial mpi
++ )
++PACKAGE_ADD_EXECUTABLE(
++ hgedge_weights
++ SOURCES hgedge_weights.cpp
++ DEPLIBS isorropia_test_utils
++ COMM serial mpi
++ )
++PACKAGE_ADD_EXECUTABLE(
++ part_redist
++ SOURCES part_redist.cpp
++ DEPLIBS isorropia_test_utils
++ COMM serial mpi
++ )
++PACKAGE_ADD_EXECUTABLE(
++ vert_weights
++ SOURCES vert_weights.cpp
++ DEPLIBS isorropia_test_utils
++ COMM serial mpi
++ )
++PACKAGE_ADD_EXECUTABLE(
++ redist_map
++ SOURCES redist_map.cpp
++ DEPLIBS isorropia_test_utils
++ COMM serial mpi
++ )
++PACKAGE_ADD_EXECUTABLE(
++ parallel_matching
++ SOURCES parallel_matching.cpp
++ DEPLIBS isorropia_test_utils
++ COMM serial mpi
++ )
++PACKAGE_ADD_EXECUTABLE(
++ probe_tridiag
++ SOURCES probe_tridiag.cpp
++ DEPLIBS isorropia_test_utils
++ COMM mpi
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/isorropia/example/geometric/CMakeLists.txt trilinos-10.8.5.dfsg/packages/isorropia/example/geometric/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/isorropia/example/geometric/CMakeLists.txt 2012-01-09 18:06:09.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/isorropia/example/geometric/CMakeLists.txt 2012-02-06 13:03:19.263235177 +0100
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
example_rcb
@@ -595,11 +2088,10 @@
COMM serial mpi
)
-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 @@
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/isorropia/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/isorropia/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/isorropia/src/CMakeLists.txt 2012-01-09 18:06:10.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/isorropia/src/CMakeLists.txt 2012-02-06 15:10:25.806965424 +0100
+@@ -175,14 +175,14 @@
# C) Define the targets for package's library(s)
#
PACKAGE_ADD_LIBRARY(
@@ -608,10 +2100,210 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+
+ #PACKAGE_ADD_LIBRARY(
+-# isorropia
++# trilinos_isorropia
+ # HEADERS ${HEADERS}
+ # SOURCES ${SOURCES}
+-# DEPLIBS isorropia_test_utils
++# DEPLIBS trilinos_isorropia_test_utils
+ # )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/isorropia/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/isorropia/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/isorropia/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/isorropia/src/CMakeLists.txt.orig 2012-02-06 12:48:02.127267616 +0100
+@@ -0,0 +1,188 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++SET(HAVE_EPETRA ON)
++SET(HAVE_ISORROPIA_TPETRA OFF)
++SET(HAVE_ISORROPIA_ZOLTAN ON)
++SET(HAVE_EPETRAEXT ${PACKAGE_NAME}_ENABLE_EpetraExt)
++SET(ISORROPIA_HAVE_OMP ${Trilinos_ENABLE_OpenMP})
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS)
++SET(SOURCES)
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
++ )
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++SET(HEADERS ${HEADERS}
++ Isorropia_CostDescriber.hpp
++ Isorropia_Operator.hpp
++ Isorropia_Partitioner.hpp
++ Isorropia_Colorer.hpp
++ Isorropia_Orderer.hpp
++ Isorropia_Redistributor.hpp
++ Isorropia_Utils.hpp
++ Isorropia_Exception.hpp
++ Isorropia_ConfigDefs.hpp
++ Isorropia_Version.hpp
++ Isorropia_LevelScheduler.hpp
++ )
++
++SET(SOURCES ${SOURCES}
++ Isorropia_Utils.cpp
++ Isorropia_Exception.cpp
++ )
++
++#
++# src/epetra
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra)
++#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../utils)
++
++SET(HEADERS ${HEADERS}
++ epetra/Isorropia_EpetraCostDescriber.hpp
++ epetra/Isorropia_EpetraPartitioner.hpp
++ epetra/Isorropia_EpetraOperator.hpp
++ epetra/Isorropia_EpetraColorer.hpp
++ epetra/Isorropia_EpetraOrderer.hpp
++ epetra/Isorropia_EpetraProber.hpp
++ epetra/Isorropia_Epetra.hpp
++ epetra/Isorropia_EpetraRedistributor.hpp
++ epetra/Isorropia_EpetraLibrary.hpp
++ epetra/Isorropia_EpetraLevelScheduler.hpp
++ epetra/Isorropia_EpetraMatcher.hpp
++ )
++
++SET(SOURCES ${SOURCES}
++ epetra/Isorropia_EpetraCostDescriber.cpp
++ epetra/Isorropia_EpetraOperator.cpp
++ epetra/Isorropia_EpetraPartitioner.cpp
++ epetra/Isorropia_EpetraColorer.cpp
++ epetra/Isorropia_EpetraOrderer.cpp
++ epetra/Isorropia_EpetraProber.cpp
++ epetra/Isorropia_Epetra.cpp
++ epetra/Isorropia_EpetraRedistributor.cpp
++ epetra/Isorropia_EpetraLibrary.cpp
++ epetra/Isorropia_EpetraLevelScheduler.cpp
++ epetra/Isorropia_EpetraMatcher.cpp
++ )
++
++#
++# src/tpetra
++#
++
++IF (${PACKAGE_NAME}_ENABLE_TPETRA)
++# SET(HAVE_ISORROPIA_TPETRA ON)
++
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/tpetra)
++
++ SET(HEADERS ${HEADERS}
++ tpetra/Isorropia_TpetraCostDescriber.hpp
++ tpetra/Isorropia_TpetraOperator.hpp
++ tpetra/Isorropia_TpetraPartitioner.hpp
++ tpetra/Isorropia_Tpetra.hpp
++ tpetra/Isorropia_TpetraRedistributor.hpp
++ tpetra/Isorropia_TpetraLibrary.hpp
++ tpetra/Isorropia_TpetraLevelScheduler.hpp
++ )
++
++ SET(SOURCES ${SOURCES}
++ tpetra/Isorropia_TpetraCostDescriber.cpp
++ tpetra/Isorropia_TpetraOperator.cpp
++ tpetra/Isorropia_TpetraPartitioner.cpp
++ tpetra/Isorropia_Tpetra.cpp
++ tpetra/Isorropia_TpetraRedistributor.cpp
++ tpetra/Isorropia_TpetraLibrary.cpp
++ tpetra/Isorropia_TpetraLevelScheduler.cpp
++ )
++
++ # Zoltan
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/tpetra/zoltanLib)
++
++ SET(HEADERS ${HEADERS}
++ tpetra/zoltanLib/Isorropia_TpetraQueryObject.hpp
++ tpetra/Isorropia_TpetraZoltanLib.hpp
++ )
++
++ SET(SOURCES ${SOURCES}
++ tpetra/zoltanLib/Isorropia_TpetraQueryObject.cpp
++ tpetra/Isorropia_TpetraZoltanLib.cpp
++ )
++
++
++
++ENDIF()
++
++
++
++
++# zoltan
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetra/zoltanLib)
++
++SET(HEADERS ${HEADERS}
++ epetra/zoltanLib/QueryObject.hpp
++ epetra/Isorropia_EpetraZoltanLib.hpp
++ #epetra/zoltanLib/Isorropia_Zoltan_Repartition.hpp
++ )
++
++SET(SOURCES ${SOURCES}
++ epetra/zoltanLib/QueryObject.cpp
++ epetra/Isorropia_EpetraZoltanLib.cpp
++ #epetra/zoltanLib/Isorropia_Zoltan_Repartition.cpp
++ )
++
++
++
++#
++# 2D partitioning
++#
++
++IF (${PACKAGE_NAME}_ENABLE_2DPARTITION)
++
++ APPEND_SET(HEADERS
++ Isorropia_Partitioner2D.hpp
++ epetra/Isorropia_EpetraPartitioner2D.hpp
++ )
++
++ APPEND_SET(SOURCES
++ epetra/Isorropia_EpetraPartitioner2D.cpp
++ )
++
++ENDIF()
++
++
++
++#
++# C) Define the targets for package's library(s)
++#
++PACKAGE_ADD_LIBRARY(
++ isorropia
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ )
++
++#PACKAGE_ADD_LIBRARY(
++# isorropia
++# HEADERS ${HEADERS}
++# SOURCES ${SOURCES}
++# DEPLIBS isorropia_test_utils
++# )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/isorropia/test/geometric/CMakeLists.txt trilinos-10.8.5.dfsg/packages/isorropia/test/geometric/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/isorropia/test/geometric/CMakeLists.txt 2012-01-09 18:06:10.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/isorropia/test/geometric/CMakeLists.txt 2012-02-06 13:03:19.263235177 +0100
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_geometric
@@ -621,10 +2313,9 @@
COMM serial mpi
ARGS
"--f=brack_3D.coords"
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/isorropia/test/levelsolver/CMakeLists.txt trilinos-10.8.5.dfsg/packages/isorropia/test/levelsolver/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/isorropia/test/levelsolver/CMakeLists.txt 2012-01-09 18:06:10.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/isorropia/test/levelsolver/CMakeLists.txt 2012-02-06 13:03:19.263235177 +0100
@@ -7,7 +7,7 @@
COMM serial mpi
ARGS
@@ -634,10 +2325,9 @@
)
PACKAGE_COPY_FILES_TO_BINARY_DIR(TestLevelSolverCopyFiles
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/isorropia/test/mtx/CMakeLists.txt trilinos-10.8.5.dfsg/packages/isorropia/test/mtx/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/isorropia/test/mtx/CMakeLists.txt 2012-01-09 18:06:10.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/isorropia/test/mtx/CMakeLists.txt 2012-02-06 15:11:01.902964148 +0100
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_balanced_copy
@@ -656,7 +2346,24 @@
COMM serial mpi
ARGS
"--f=simple.mtx"
-@@ -47,7 +47,7 @@
+@@ -31,7 +31,7 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ test_unsym
+ SOURCES test_unsym.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ ARGS
+ "--f=west0067.mtx"
+@@ -40,14 +40,14 @@
+ PACKAGE_ADD_EXECUTABLE_AND_TEST(
+ test_simple_methods
+ SOURCES test_simple_methods.cpp
+- DEPLIBS isorropia_test_utils
++ DEPLIBS trilinos_isorropia_test_utils
+ COMM serial mpi
+ )
+
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_colorer
SOURCES test_colorer.cpp
@@ -665,10 +2372,9 @@
COMM serial mpi
ARGS
"--f=simple.mtx"
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/isorropia/test/part_sizes/CMakeLists.txt trilinos-10.8.5.dfsg/packages/isorropia/test/part_sizes/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/isorropia/test/part_sizes/CMakeLists.txt 2012-01-09 18:06:10.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/isorropia/test/part_sizes/CMakeLists.txt 2012-02-06 13:03:19.263235177 +0100
@@ -6,7 +6,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
part_sizes
@@ -678,10 +2384,9 @@
COMM serial mpi
ARGS
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/isorropia/test/probing/CMakeLists.txt trilinos-10.8.5.dfsg/packages/isorropia/test/probing/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/isorropia/test/probing/CMakeLists.txt 2012-01-09 18:06:10.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/isorropia/test/probing/CMakeLists.txt 2012-02-06 13:03:19.263235177 +0100
@@ -5,7 +5,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_probing
@@ -691,10 +2396,9 @@
COMM serial mpi
ARGS
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/isorropia/utils/CMakeLists.txt trilinos-10.8.5.dfsg/packages/isorropia/utils/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/isorropia/utils/CMakeLists.txt 2012-01-09 18:06:11.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/isorropia/utils/CMakeLists.txt 2012-02-06 13:03:19.267235177 +0100
@@ -33,9 +33,9 @@
#
@@ -707,22 +2411,230 @@
- DEPLIBS isorropia
+ DEPLIBS trilinos_isorropia
)
-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 @@
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/array/perf_test/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/array/perf_test/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/array/perf_test/CMakeLists.txt 2012-01-09 18:03:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/array/perf_test/CMakeLists.txt 2012-02-06 15:04:12.130978642 +0100
+@@ -5,14 +5,14 @@
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../TPL)
+
+ SET(SOURCES PerfTestMain.cpp PerfTestHost.cpp ../TPL/gtest/gtest-all.cc)
+-SET(LIBRARIES kokkos kokkosdevicehost kokkosimpl)
++SET(LIBRARIES trilinos_kokkos trilinos_kokkosdevicehost trilinos_kokkosimpl)
+
+ IF(Kokkos_ENABLE_DeviceTPI)
+ LIST(APPEND SOURCES
+ PerfTestTPI.cpp
+ )
+ LIST(APPEND LIBRARIES
+- kokkosdevicetpi
++ trilinos_kokkosdevicetpi
+ )
+ ENDIF()
+
+@@ -21,20 +21,20 @@
+ PerfTestTBB.cpp
+ )
+ LIST( APPEND LIBRARIES
+- kokkosdevicetbb tbb
++ trilinos_kokkosdevicetbb trilinos_tbb
+ )
+ ENDIF()
+
+ IF(Kokkos_ENABLE_DeviceCuda)
+ PACKAGE_ADD_CUDA_LIBRARY(
+- perf_cuda
++ trilinos_perf_cuda
+ SOURCES PerfTestCuda.cu
+ )
+ LIST(APPEND SOURCES
+ PerfTestCuda.cpp
+ )
+ LIST(APPEND LIBRARIES
+- kokkosdevicecuda perf_cuda
++ trilinos_kokkosdevicecuda trilinos_perf_cuda
+ )
+ ENDIF()
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/array/src/DeviceCuda/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/array/src/DeviceCuda/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/array/src/DeviceCuda/CMakeLists.txt 2012-01-09 18:03:56.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/array/src/DeviceCuda/CMakeLists.txt 2012-02-06 14:53:16.935001815 +0100
+@@ -24,18 +24,18 @@
+ #set(CUDA_ATTACH_VS_BUILD_RULE_TO_CUDA_FILE OFF)
+ #CUDA_COMPILE(CUDA_FILE Kokkos_DeviceCuda.cu)
+ PACKAGE_ADD_CUDA_LIBRARY(
+- kokkosdevicecuda_lib
++ trilinos_kokkosdevicecuda_lib
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+- SET(CUDA_LIB kokkosdevicecuda_lib)
++ SET(CUDA_LIB trilinos_kokkosdevicecuda_lib)
+ ELSE()
+ SET(CUDA_LIB "")
+ ENDIF()
+
+
+ PACKAGE_ADD_LIBRARY(
+- kokkosdevicecuda
++ trilinos_kokkosdevicecuda
+ HEADERS ${HEADERS}
+ DEPLIBS ${CUDA_LIB}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/array/src/DeviceHost/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/array/src/DeviceHost/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/array/src/DeviceHost/CMakeLists.txt 2012-01-09 18:03:56.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/array/src/DeviceHost/CMakeLists.txt 2012-02-06 14:52:14.759004015 +0100
+@@ -19,8 +19,8 @@
+
+
+ PACKAGE_ADD_LIBRARY(
+- kokkosdevicehost
++ trilinos_kokkosdevicehost
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS kokkos
++ DEPLIBS trilinos_kokkos
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/array/src/DeviceTBB/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/array/src/DeviceTBB/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/array/src/DeviceTBB/CMakeLists.txt 2012-01-09 18:03:56.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/array/src/DeviceTBB/CMakeLists.txt 2012-02-06 14:53:23.847001570 +0100
+@@ -19,8 +19,8 @@
+
+
+ PACKAGE_ADD_LIBRARY(
+- kokkosdevicetbb
++ trilinos_kokkosdevicetbb
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS kokkos tbb
++ DEPLIBS trilinos_kokkos trilinos_tbb
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/array/src/DeviceTPI/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/array/src/DeviceTPI/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/array/src/DeviceTPI/CMakeLists.txt 2012-01-09 18:03:56.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/array/src/DeviceTPI/CMakeLists.txt 2012-02-06 14:53:35.991001142 +0100
+@@ -19,8 +19,8 @@
+
+
+ PACKAGE_ADD_LIBRARY(
+- kokkosdevicetpi
++ trilinos_kokkosdevicetpi
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS kokkos
++ DEPLIBS trilinos_kokkos
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/array/src/impl/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/array/src/impl/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/array/src/impl/CMakeLists.txt 2012-01-09 18:03:56.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/array/src/impl/CMakeLists.txt 2012-02-06 14:51:09.911006309 +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.
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/array/unit_test/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/array/unit_test/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/array/unit_test/CMakeLists.txt 2012-01-09 18:03:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/array/unit_test/CMakeLists.txt 2012-02-06 15:03:29.442980149 +0100
+@@ -5,14 +5,14 @@
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../TPL)
+
+ SET(SOURCES UnitTestMain.cpp UnitTestHost.cpp ../TPL/gtest/gtest-all.cc)
+-SET(LIBRARIES kokkos kokkosdevicehost kokkosimpl)
++SET(LIBRARIES trilinos_kokkos trilinos_kokkosdevicehost trilinos_kokkosimpl)
+
+ IF(Kokkos_ENABLE_DeviceTPI)
+ LIST( APPEND SOURCES
+ UnitTestTPI.cpp
+ )
+ LIST( APPEND LIBRARIES
+- kokkosdevicetpi
++ trilinos_kokkosdevicetpi
+ )
+ ENDIF()
+
+@@ -21,20 +21,20 @@
+ UnitTestTBB.cpp
+ )
+ LIST( APPEND LIBRARIES
+- kokkosdevicetbb tbb
++ trilinos_kokkosdevicetbb trilinos_tbb
+ )
+ ENDIF()
+
+ IF(Kokkos_ENABLE_DeviceCuda)
+ PACKAGE_ADD_CUDA_LIBRARY(
+- unit_cuda
++ trilinos_unit_cuda
+ SOURCES UnitTestCuda.cu
+ )
+ LIST( APPEND SOURCES
+ UnitTestCuda.cpp
+ )
+ LIST( APPEND LIBRARIES
+- kokkosdevicecuda unit_cuda
++ trilinos_kokkosdevicecuda trilinos_unit_cuda
+ )
+ ENDIF()
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/DistTSQR/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/DistTSQR/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/DistTSQR/CMakeLists.txt 2012-01-09 18:03:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/DistTSQR/CMakeLists.txt 2012-02-06 14:54:32.902999130 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/DistTSQR/test/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/DistTSQR/test/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/DistTSQR/test/CMakeLists.txt 2012-01-09 18:03:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/DistTSQR/test/CMakeLists.txt 2012-02-06 15:34:34.054914199 +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 trilinos_kokkosnodetsqr trilinos_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
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/CMakeLists.txt 2012-01-09 18:03:55.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/CMakeLists.txt 2012-02-06 14:55:00.630998152 +0100
+@@ -68,11 +68,11 @@
ASSERT_DEFINED(Kokkos_ENABLE_Thrust)
IF (Kokkos_ENABLE_Thrust)
PACKAGE_ADD_CUDA_LIBRARY(
- kokkoslinalg_cuda
-+ trilinos_kokkoslinalg_cuda
++ trilinos_kokkoslinalg_cuda
SOURCES ${CUDA_SOURCES}
- DEPLIBS teuchos
+ DEPLIBS trilinos_teuchos
)
- SET(KOKKOS_LINALG_CUDALIBS "kokkoslinalg_cuda")
+- SET(KOKKOS_LINALG_CUDALIBS "kokkoslinalg_cuda")
++ SET(KOKKOS_LINALG_CUDALIBS "trilinos_kokkoslinalg_cuda")
ELSE()
+ SET(KOKKOS_LINALG_CUDALIBS "")
+ ENDIF()
@@ -82,10 +82,10 @@
#
@@ -736,10 +2648,31 @@
)
PACKAGE_ADD_TEST_DIRECTORIES(examples)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/examples/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/examples/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/examples/CMakeLists.txt 2012-01-09 18:03:55.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/examples/CMakeLists.txt 2012-02-06 15:35:13.542912802 +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)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/examples/PDP10/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/examples/PDP10/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/examples/PDP10/CMakeLists.txt 2012-01-09 18:03:55.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/examples/PDP10/CMakeLists.txt 2012-02-06 15:35:19.302912600 +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()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt 2012-01-09 18:03:55.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt 2012-02-06 15:34:59.974913282 +0100
@@ -6,7 +6,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -794,10 +2727,83 @@
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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/test/CrsMatrix/CMakeLists.txt.orig 2012-02-06 12:48:01.751267629 +0100
+@@ -0,0 +1,70 @@
++INCLUDE(PackageAddExecutableAndTest)
++PACKAGE_ADD_EXECUTABLE_AND_TEST( CrsMatrix_DefaultMultiply
++ SOURCES
++ CrsMatrix_DefaultMultiply.cpp
++ ${TEUCHOS_STD_UNIT_TEST_MAIN}
++ COMM serial mpi
++ NUM_MPI_PROCS 1
++ STANDARD_PASS_OUTPUT
++ DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++)
++
++INCLUDE(PackageAddExecutableAndTest)
++PACKAGE_ADD_EXECUTABLE_AND_TEST( CrsMatrix_Scale
++ SOURCES
++ CrsMatrix_Scale.cpp
++ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
++ COMM serial mpi
++ NUM_MPI_PROCS 1
++ STANDARD_PASS_OUTPUT
++ DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++)
++
++PACKAGE_ADD_EXECUTABLE_AND_TEST( CrsMatrix_UnitTests
++ SOURCES
++ CrsMatrix_UnitTests.cpp
++ ${TEUCHOS_STD_UNIT_TEST_MAIN}
++ COMM serial mpi
++ NUM_MPI_PROCS 1
++ STANDARD_PASS_OUTPUT
++ DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++)
++
++IF (Kokkos_ENABLE_ThreadPool)
++ PACKAGE_ADD_EXECUTABLE_AND_TEST( CrsMatrix_FirstTouchTPI
++ SOURCES
++ CrsMatrix_FirstTouchTPI.cpp
++ ${TEUCHOS_STD_UNIT_TEST_MAIN}
++ COMM serial mpi
++ NUM_MPI_PROCS 1
++ STANDARD_PASS_OUTPUT
++ DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ INSTALLABLE
++ )
++ENDIF (Kokkos_ENABLE_ThreadPool)
++
++IF (Kokkos_ENABLE_TBB)
++ PACKAGE_ADD_EXECUTABLE_AND_TEST( CrsMatrix_FirstTouchTBB
++ SOURCES
++ CrsMatrix_FirstTouchTBB.cpp
++ ${TEUCHOS_STD_UNIT_TEST_MAIN}
++ COMM serial mpi
++ NUM_MPI_PROCS 1
++ STANDARD_PASS_OUTPUT
++ DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ INSTALLABLE
++ )
++ENDIF (Kokkos_ENABLE_TBB)
++
++IF (Kokkos_ENABLE_CUSP)
++ PACKAGE_ADD_EXECUTABLE_AND_TEST( CrsMatrix_CUSP
++ SOURCES
++ CrsMatrix_CUSP.cpp
++ ${TEUCHOS_STD_UNIT_TEST_MAIN}
++ COMM serial mpi
++ NUM_MPI_PROCS 1
++ STANDARD_PASS_OUTPUT
++ DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ INSTALLABLE
++ )
++ENDIF()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt 2012-01-09 18:03:55.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/test/MultiVector/CMakeLists.txt 2012-02-06 13:03:19.267235177 +0100
@@ -6,7 +6,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -814,10 +2820,9 @@
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt 2012-01-09 18:03:55.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/test/Relaxation/CMakeLists.txt 2012-02-06 13:03:19.267235177 +0100
@@ -6,5 +6,5 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -825,10 +2830,9 @@
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt 2012-01-09 18:03:55.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/LinAlg/test/VbrMatrix/CMakeLists.txt 2012-02-06 13:03:19.267235177 +0100
@@ -8,5 +8,5 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -836,10 +2840,9 @@
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/NodeAPI/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/NodeAPI/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/NodeAPI/CMakeLists.txt 2012-01-09 18:03:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/NodeAPI/CMakeLists.txt 2012-02-06 13:03:19.267235177 +0100
@@ -99,10 +99,10 @@
#
@@ -853,10 +2856,132 @@
)
PACKAGE_ADD_TEST_DIRECTORIES(test)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/NodeAPI/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/kokkos/NodeAPI/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/NodeAPI/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/NodeAPI/CMakeLists.txt.orig 2012-02-06 12:48:01.751267629 +0100
+@@ -0,0 +1,109 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
++ )
++
++#
++# Core Files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++# CUDA-specific source and headers
++APPEND_SET(CUDA_HEADERS
++ Kokkos_CUDANodeMemoryModel.hpp
++ Kokkos_CUDANodeMemoryModelImpl.hpp
++ Kokkos_ThrustGPUNode.cuh
++ Kokkos_ThrustGPUNode.hpp
++ Kokkos_CUDANodeUtils.hpp
++)
++APPEND_SET(CUDA_SOURCES
++ Kokkos_CUDANodeMemoryModel.cpp
++ Kokkos_ThrustGPUNode.cpp
++ Kokkos_CUDANodeUtils.cpp
++)
++
++# TBB-specific source and headers
++APPEND_SET(TBB_HEADERS
++ Kokkos_TBBNode.hpp
++)
++APPEND_SET(TBB_SOURCES
++ Kokkos_TBBNode.cpp
++)
++
++# TPI-specific source and headers
++APPEND_SET(TPI_HEADERS
++ Kokkos_TPINode.hpp
++)
++APPEND_SET(TPI_SOURCES
++ Kokkos_TPINode.cpp
++)
++
++# general headers, sources
++APPEND_SET(HEADERS
++ Kokkos_BufferMacros.hpp
++ Kokkos_DefaultNode.hpp
++ Kokkos_NodeHelpers.hpp
++ Kokkos_NodeAPIConfigDefs.hpp
++ Kokkos_NodeAPIVersion.hpp
++ Kokkos_NodeTrace.hpp
++ Kokkos_SerialNode.hpp
++ Kokkos_StandardNodeMemoryModel.hpp
++ )
++APPEND_SET(SOURCES
++ Kokkos_DefaultNode.cpp
++ Kokkos_NodeAPIVersion.cpp
++ )
++
++ASSERT_DEFINED(Kokkos_ENABLE_Thrust)
++IF (Kokkos_ENABLE_Thrust)
++ APPEND_SET(HEADERS ${CUDA_HEADERS})
++ APPEND_SET(SOURCES ${CUDA_SOURCES})
++ENDIF()
++
++ASSERT_DEFINED(Kokkos_ENABLE_TBB)
++IF (Kokkos_ENABLE_TBB)
++ APPEND_SET(HEADERS ${TBB_HEADERS})
++ APPEND_SET(SOURCES ${TBB_SOURCES})
++ENDIF()
++
++ASSERT_DEFINED(Kokkos_ENABLE_ThreadPool)
++IF (Kokkos_ENABLE_ThreadPool)
++ APPEND_SET(HEADERS ${TPI_HEADERS})
++ APPEND_SET(SOURCES ${TPI_SOURCES})
++ENDIF()
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ kokkosnodeapi
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ DEPLIBS kokkos
++ )
++
++PACKAGE_ADD_TEST_DIRECTORIES(test)
++PACKAGE_ADD_TEST_DIRECTORIES(examples)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/NodeAPI/examples/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/NodeAPI/examples/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/NodeAPI/examples/CMakeLists.txt 2012-01-09 18:03:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/NodeAPI/examples/CMakeLists.txt 2012-02-06 15:34:20.694914671 +0100
+@@ -7,5 +7,5 @@
+ COMM serial mpi
+ NUM_MPI_PROCS 1
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkosnodeapi
++ DEPLIBS trilinos_kokkosnodeapi
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/NodeAPI/test/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/NodeAPI/test/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/NodeAPI/test/CMakeLists.txt 2012-01-09 18:03:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/NodeAPI/test/CMakeLists.txt 2012-02-06 15:34:13.638914920 +0100
@@ -9,7 +9,7 @@
COMM serial mpi
NUM_MPI_PROCS 1
@@ -902,10 +3027,72 @@
)
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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/NodeTSQR/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/NodeTSQR/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/NodeTSQR/CMakeLists.txt 2012-01-09 18:03:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/NodeTSQR/CMakeLists.txt 2012-02-06 14:55:07.606997900 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/NodeTSQR/test/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/NodeTSQR/test/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/NodeTSQR/test/CMakeLists.txt 2012-01-09 18:03:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/NodeTSQR/test/CMakeLists.txt 2012-02-06 15:35:48.086911581 +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
+ )
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/kokkos/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/kokkos/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/kokkos/src/CMakeLists.txt 2012-01-09 18:03:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/kokkos/src/CMakeLists.txt 2012-02-06 13:03:19.267235177 +0100
@@ -44,7 +44,7 @@
#
@@ -915,10 +3102,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/komplex/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/komplex/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/komplex/src/CMakeLists.txt 2012-01-09 18:05:22.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/komplex/src/CMakeLists.txt 2012-02-06 13:03:19.267235177 +0100
@@ -69,7 +69,7 @@
#
@@ -928,10 +3114,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/mesquite/itaps/CMakeLists.txt trilinos-10.8.5.dfsg/packages/mesquite/itaps/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/mesquite/itaps/CMakeLists.txt 2012-01-09 18:05:50.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/mesquite/itaps/CMakeLists.txt 2012-02-06 13:03:19.267235177 +0100
@@ -9,7 +9,7 @@
SET(${PACKAGE_NAME}_ENABLE_IMESH ON)
MAKEFILE_VAL(${IMESH_DEFS} IMESH_LIBS IMESH_LIBS)
@@ -967,10 +3152,9 @@
SET_SOURCE_FILES_PROPERTIES( MsqIMeshP.cpp COMPILE_FLAGS ${MESQUITE_LIB_DEFINES} )
ENDIF(IMESHP_DEFS)
ENDIF()
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/mesquite/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/mesquite/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/mesquite/src/CMakeLists.txt 2012-01-09 18:05:50.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/mesquite/src/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -851,7 +851,7 @@
#
@@ -980,10 +3164,885 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/mesquite/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/mesquite/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/mesquite/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/mesquite/src/CMakeLists.txt.orig 2012-02-06 12:48:02.115267617 +0100
+@@ -0,0 +1,872 @@
++IF (NOT ${PROJECT_NAME} STREQUAL "Mesquite")
++
++ INCLUDE(PackageLibraryMacros)
++
++ #
++ # A) Package-specific configuration options
++ #
++
++ELSE()
++ MACRO(APPEND_SET VARNAME)
++ SET(${VARNAME} ${${VARNAME}} ${ARGN})
++ ENDMACRO()
++
++ FUNCTION(PACKAGE_ADD_LIBRARY name)
++ LIST(REMOVE_ITEM ARGV "${name}" "HEADERS" "SOURCES")
++ IF(${PACKAGE_NAME}_ENABLE_SHARED)
++ ADD_LIBRARY( ${name} SHARED ${ARGV} )
++ ELSE()
++ ADD_LIBRARY( ${name} STATIC ${ARGV} )
++ ENDIF()
++ ENDFUNCTION()
++ENDIF()
++
++
++
++autoconf_header( ${CMAKE_CURRENT_SOURCE_DIR}/include/mesquite_version.h.in
++ ${CMAKE_CURRENT_BINARY_DIR}/include/mesquite_version.h )
++autoconf_header( ${CMAKE_CURRENT_SOURCE_DIR}/include/mesquite_config.h.in
++ ${CMAKE_CURRENT_BINARY_DIR}/include/mesquite_config.h )
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++APPEND_SET(HEADERS
++ ${CMAKE_CURRENT_BINARY_DIR}/include/mesquite_config.h
++ ${CMAKE_CURRENT_BINARY_DIR}/include/mesquite_version.h
++ include/Mesquite.hpp
++ include/MeshInterface.hpp
++ include/ParallelMeshInterface.hpp
++ include/ParallelHelperInterface.hpp
++ include/CurveDomain.hpp
++ )
++
++#
++# src/Mesh
++#
++
++IF (TPL_ENABLE_MPI)
++ APPEND_SET(HEADERS
++ Mesh/ParallelHelper.hpp
++ )
++
++ APPEND_SET(SOURCES
++ Mesh/ParallelHelper.cpp
++ )
++ENDIF()
++
++APPEND_SET(HEADERS
++ Mesh/ArrayMesh.hpp
++ Mesh/ElementPatches.hpp
++ Mesh/ExtraData.hpp
++ Mesh/ExtraDataUser.hpp
++ Mesh/GlobalPatch.hpp
++ Mesh/IdealElements.hpp
++ Mesh/MeshDecorator.hpp
++ Mesh/MeshImpl.hpp
++ Mesh/MeshImplData.hpp
++ Mesh/MeshImplTags.hpp
++ Mesh/MeshUtil.hpp
++ Mesh/MeshWriter.hpp
++ Mesh/MsqFreeVertexIndexIterator.hpp
++ Mesh/MsqMeshEntity.hpp
++ Mesh/MsqVertex.hpp
++ Mesh/ParallelMeshImpl.hpp
++ Mesh/PatchData.hpp
++ Mesh/PatchIterator.hpp
++ Mesh/PatchSet.hpp
++ Mesh/TagVertexMesh.hpp
++ Mesh/TopologyInfo.hpp
++ Mesh/VertexPatches.hpp
++ )
++
++APPEND_SET(SOURCES
++ Mesh/ArrayMesh.cpp
++ Mesh/ElementPatches.cpp
++ Mesh/ExtraData.cpp
++ Mesh/GlobalPatch.cpp
++ Mesh/IdealElements.cpp
++ Mesh/MeshDecorator.cpp
++ Mesh/MeshImpl.cpp
++ Mesh/MeshImplData.cpp
++ Mesh/MeshImplTags.cpp
++ Mesh/MeshUtil.cpp
++ Mesh/MeshWriter.cpp
++ Mesh/MsqMeshEntity.cpp
++ Mesh/MsqVertex.cpp
++ Mesh/ParallelMeshImpl.cpp
++ Mesh/PatchData.cpp
++ Mesh/PatchIterator.cpp
++ Mesh/PatchSet.cpp
++ Mesh/TagVertexMesh.cpp
++ Mesh/TopologyInfo.cpp
++ Mesh/VertexPatches.cpp
++ )
++
++#
++# src/Control
++#
++
++APPEND_SET(HEADERS
++ Control/Instruction.hpp
++ Control/InstructionQueue.hpp
++ Control/IQInterface.hpp
++ Control/TerminationCriterion.hpp
++ Control/Settings.hpp
++ Control/SlaveBoundaryVertices.hpp
++ Control/VertexSlaver.hpp
++ )
++
++APPEND_SET(SOURCES
++ Control/Instruction.cpp
++ Control/InstructionQueue.cpp
++ Control/IQInterface.cpp
++ Control/TerminationCriterion.cpp
++ Control/Settings.cpp
++ Control/SlaveBoundaryVertices.cpp
++ )
++
++
++#
++# src/Wrappers
++#
++
++APPEND_SET(HEADERS
++ Wrappers/DeformingDomainWrapper.hpp
++ Wrappers/LaplaceWrapper.hpp
++ Wrappers/ShapeImprovementWrapper.hpp
++ Wrappers/ShapeImprover.hpp
++ Wrappers/SizeAdaptShapeWrapper.hpp
++ Wrappers/PaverMinEdgeLengthWrapper.hpp
++ Wrappers/UntangleWrapper.hpp
++ Wrappers/ViscousCFDTetShapeWrapper.hpp
++ Wrappers/Wrapper.hpp
++ )
++
++APPEND_SET(SOURCES
++ Wrappers/DeformingDomainWrapper.cpp
++ Wrappers/LaplaceWrapper.cpp
++ Wrappers/ShapeImprovementWrapper.cpp
++ Wrappers/ShapeImprover.cpp
++ Wrappers/SizeAdaptShapeWrapper.cpp
++ Wrappers/PaverMinEdgeLengthWrapper.cpp
++ Wrappers/UntangleWrapper.cpp
++ Wrappers/ViscousCFDTetShapeWrapper.cpp
++ Wrappers/Wrapper.cpp
++ )
++
++#
++# src/MappingFunction
++#
++
++APPEND_SET(HEADERS
++ MappingFunction/MappingFunction.hpp
++ MappingFunction/NodeSet.hpp
++ MappingFunction/Sample.hpp
++ )
++
++APPEND_SET(SOURCES
++ MappingFunction/MappingFunction.cpp
++ MappingFunction/NodeSet.cpp
++ MappingFunction/Sample.cpp
++ )
++
++#
++# src/MappingFunction/Lagrange
++#
++
++APPEND_SET(HEADERS
++ MappingFunction/Lagrange/HexLagrangeShape.hpp
++ MappingFunction/Lagrange/QuadLagrangeShape.hpp
++ MappingFunction/Lagrange/TetLagrangeShape.hpp
++ MappingFunction/Lagrange/TriLagrangeShape.hpp
++ )
++
++APPEND_SET(SOURCES
++ MappingFunction/Lagrange/HexLagrangeShape.cpp
++ MappingFunction/Lagrange/QuadLagrangeShape.cpp
++ MappingFunction/Lagrange/TetLagrangeShape.cpp
++ MappingFunction/Lagrange/TriLagrangeShape.cpp
++ )
++
++#
++# src/MappingFunction/Linear
++#
++
++APPEND_SET(HEADERS
++ MappingFunction/Linear/LinearHexahedron.hpp
++ MappingFunction/Linear/LinearPrism.hpp
++ MappingFunction/Linear/LinearPyramid.hpp
++ MappingFunction/Linear/LinearQuadrilateral.hpp
++ MappingFunction/Linear/LinearTetrahedron.hpp
++ MappingFunction/Linear/LinearTriangle.hpp
++ )
++
++APPEND_SET(SOURCES
++ MappingFunction/Linear/LinearHexahedron.cpp
++ MappingFunction/Linear/LinearPrism.cpp
++ MappingFunction/Linear/LinearPyramid.cpp
++ MappingFunction/Linear/LinearQuadrilateral.cpp
++ MappingFunction/Linear/LinearTetrahedron.cpp
++ MappingFunction/Linear/LinearTriangle.cpp
++ )
++
++#
++# src/Misc
++#
++
++APPEND_SET(HEADERS
++ Misc/BoundedCylinderDomain.hpp
++ Misc/Bits.hpp
++ Misc/ConicDomain.hpp
++ Misc/CylinderDomain.hpp
++ Misc/DomainClassifier.hpp
++ Misc/EdgeIterator.hpp
++ Misc/Exponent.hpp
++ Misc/FileTokenizer.hpp
++ Misc/Matrix3D.hpp
++ Misc/MeshDomain1D.hpp
++ Misc/MeshTransform.hpp
++ Misc/MsqDebug.hpp
++ Misc/MsqError.hpp
++ Misc/MsqFPE.hpp
++ Misc/MsqGeomPrim.hpp
++ Misc/MsqHessian.hpp
++ Misc/MsqInterrupt.hpp
++ Misc/MsqMatrix.hpp
++ Misc/MsqTimer.hpp
++ Misc/PlanarDomain.hpp
++ Misc/SimpleStats.hpp
++ Misc/SphericalDomain.hpp
++ Misc/SymMatrix3D.hpp
++ Misc/Vector3D.hpp
++ Misc/VtkTypeInfo.hpp
++ Misc/XYRectangle.hpp
++ )
++
++APPEND_SET(SOURCES
++ Misc/BoundedCylinderDomain.cpp
++ Misc/ConicDomain.cpp
++ Misc/CylinderDomain.cpp
++ Misc/DomainClassifier.cpp
++ Misc/DomainUtil.cpp
++ Misc/DomainUtil.hpp
++ Misc/EdgeIterator.cpp
++ Misc/Exponent.cpp
++ Misc/FileTokenizer.cpp
++ Misc/MeshDomain1D.cpp
++ Misc/MeshTransform.cpp
++ Misc/MesquiteVersion.cpp
++ Misc/MsqDebug.cpp
++ Misc/MsqError.cpp
++ Misc/MsqFPE.cpp
++ Misc/MsqGeomPrim.cpp
++ Misc/MsqHessian.cpp
++ Misc/MsqInterrupt.cpp
++ Misc/MsqTimer.cpp
++ Misc/PlanarDomain.cpp
++ Misc/SimpleStats.cpp
++ Misc/SphericalDomain.cpp
++ Misc/Vector3D.cpp
++ Misc/VtkTypeInfo.cpp
++ Misc/XYRectangle.cpp
++ )
++IF(IMESH_DEFS OR IGEOM_DEFS OR IREL_DEFS)
++ APPEND_SET(SOURCES Misc/MsqIBase.cpp Misc/MsqIBase.hpp)
++ENDIF()
++
++
++#
++# src/ObjectiveFuntion
++#
++
++APPEND_SET(HEADERS
++ ObjectiveFunction/CompositeOFAdd.hpp
++ ObjectiveFunction/CompositeOFMultiply.hpp
++ ObjectiveFunction/CompositeOFScalarAdd.hpp
++ ObjectiveFunction/CompositeOFScalarMultiply.hpp
++ ObjectiveFunction/LInfTemplate.hpp
++ ObjectiveFunction/LPtoPTemplate.hpp
++ ObjectiveFunction/MaxTemplate.hpp
++ ObjectiveFunction/OFEvaluator.hpp
++ ObjectiveFunction/ObjectiveFunction.hpp
++ ObjectiveFunction/ObjectiveFunctionTemplate.hpp
++ ObjectiveFunction/PatchPowerMeanP.hpp
++ ObjectiveFunction/PMeanPTemplate.hpp
++ ObjectiveFunction/StdDevTemplate.hpp
++ ObjectiveFunction/VarianceTemplate.hpp
++ )
++
++APPEND_SET(SOURCES
++ ObjectiveFunction/CompositeOFAdd.cpp
++ ObjectiveFunction/CompositeOFMultiply.cpp
++ ObjectiveFunction/CompositeOFScalarAdd.cpp
++ ObjectiveFunction/CompositeOFScalarMultiply.cpp
++ ObjectiveFunction/LInfTemplate.cpp
++ ObjectiveFunction/LPtoPTemplate.cpp
++ ObjectiveFunction/MaxTemplate.cpp
++ ObjectiveFunction/OFEvaluator.cpp
++ ObjectiveFunction/ObjectiveFunction.cpp
++ ObjectiveFunction/ObjectiveFunctionTemplate.cpp
++ ObjectiveFunction/PatchPowerMeanP.cpp
++ ObjectiveFunction/PMeanPTemplate.cpp
++ ObjectiveFunction/StdDevTemplate.cpp
++ ObjectiveFunction/VarianceTemplate.cpp
++ )
++
++#
++# src/QualityAssessor
++#
++
++APPEND_SET(HEADERS
++ QualityAssessor/QualityAssessor.hpp
++ )
++
++APPEND_SET(SOURCES
++ QualityAssessor/QualityAssessor.cpp
++ )
++
++#
++# src/QualityImprover
++#
++
++APPEND_SET(HEADERS
++ QualityImprover/NullImprover.hpp
++ QualityImprover/PatchSetUser.hpp
++ QualityImprover/QualityImprover.hpp
++ QualityImprover/VertexMover.hpp
++ )
++
++APPEND_SET(SOURCES
++ QualityImprover/PatchSetUser.cpp
++ QualityImprover/QualityImprover.cpp
++ QualityImprover/VertexMover.cpp
++ )
++
++#
++# src/QualityImprover/OptSolvers
++#
++
++APPEND_SET(HEADERS
++ QualityImprover/OptSolvers/ConjugateGradient.hpp
++ QualityImprover/OptSolvers/FeasibleNewton.hpp
++ QualityImprover/OptSolvers/NonSmoothDescent.hpp
++ QualityImprover/OptSolvers/QuasiNewton.hpp
++ QualityImprover/OptSolvers/SteepestDescent.hpp
++ QualityImprover/OptSolvers/TrustRegion.hpp
++ )
++
++APPEND_SET(SOURCES
++ QualityImprover/OptSolvers/ConjugateGradient.cpp
++ QualityImprover/OptSolvers/FeasibleNewton.cpp
++ QualityImprover/OptSolvers/NonSmoothDescent.cpp
++ QualityImprover/OptSolvers/SteepestDescent.cpp
++ QualityImprover/OptSolvers/QuasiNewton.cpp
++ QualityImprover/OptSolvers/TrustRegion.cpp
++ )
++
++#
++# src/QualityImprover/Relaxation
++#
++
++APPEND_SET(HEADERS
++ QualityImprover/Relaxation/Randomize.hpp
++ QualityImprover/Relaxation/RelaxationSmoother.hpp
++ QualityImprover/Relaxation/LaplacianSmoother.hpp
++ QualityImprover/Relaxation/SmartLaplacianSmoother.hpp
++ )
++
++APPEND_SET(SOURCES
++ QualityImprover/Relaxation/Randomize.cpp
++ QualityImprover/Relaxation/RelaxationSmoother.cpp
++ QualityImprover/Relaxation/LaplacianSmoother.cpp
++ QualityImprover/Relaxation/SmartLaplacianSmoother.cpp
++ )
++
++#
++# src/QualityMetric
++#
++
++APPEND_SET(HEADERS
++ QualityMetric/AddQualityMetric.hpp
++ QualityMetric/AveragingQM.hpp
++ QualityMetric/EdgeQM.hpp
++ QualityMetric/ElemSampleQM.hpp
++ QualityMetric/ElementMaxQM.hpp
++ QualityMetric/ElementPMeanP.hpp
++ QualityMetric/ElementQM.hpp
++ QualityMetric/MultiplyQualityMetric.hpp
++ QualityMetric/Debug/NumericalQM.hpp
++ QualityMetric/Debug/CompareQM.hpp
++ QualityMetric/PMeanPMetric.hpp
++ QualityMetric/PowerQualityMetric.hpp
++ QualityMetric/QualityMetric.hpp
++ QualityMetric/ScalarAddQualityMetric.hpp
++ QualityMetric/ScalarMultiplyQualityMetric.hpp
++ QualityMetric/VertexMaxQM.hpp
++ QualityMetric/VertexPMeanP.hpp
++ QualityMetric/VertexQM.hpp
++ )
++
++APPEND_SET(SOURCES
++ QualityMetric/AddQualityMetric.cpp
++ QualityMetric/AveragingQM.cpp
++ QualityMetric/EdgeQM.cpp
++ QualityMetric/ElemSampleQM.cpp
++ QualityMetric/ElementMaxQM.cpp
++ QualityMetric/ElementPMeanP.cpp
++ QualityMetric/ElementQM.cpp
++ QualityMetric/MultiplyQualityMetric.cpp
++ QualityMetric/Debug/NumericalQM.cpp
++ QualityMetric/Debug/CompareQM.cpp
++ QualityMetric/PMeanPMetric.cpp
++ QualityMetric/PowerQualityMetric.cpp
++ QualityMetric/QualityMetric.cpp
++ QualityMetric/ScalarAddQualityMetric.cpp
++ QualityMetric/ScalarMultiplyQualityMetric.cpp
++ QualityMetric/VertexMaxQM.cpp
++ QualityMetric/VertexPMeanP.cpp
++ QualityMetric/VertexQM.cpp
++ )
++
++#
++# src/QualityMetric/Shape
++#
++
++APPEND_SET(HEADERS
++ QualityMetric/Shape/AspectRatioGammaQualityMetric.hpp
++ QualityMetric/Shape/ConditionNumberFunctions.hpp
++ QualityMetric/Shape/ConditionNumberQualityMetric.hpp
++ QualityMetric/Shape/IdealWeightInverseMeanRatio.hpp
++ QualityMetric/Shape/IdealWeightMeanRatio.hpp
++ QualityMetric/Shape/MeanRatioFunctions.hpp
++ QualityMetric/Shape/VertexConditionNumberQualityMetric.hpp
++ )
++
++APPEND_SET(SOURCES
++ QualityMetric/Shape/AspectRatioGammaQualityMetric.cpp
++ QualityMetric/Shape/ConditionNumberQualityMetric.cpp
++ QualityMetric/Shape/IdealWeightInverseMeanRatio.cpp
++ QualityMetric/Shape/IdealWeightMeanRatio.cpp
++ QualityMetric/Shape/VertexConditionNumberQualityMetric.cpp
++ )
++
++#
++# src/QualityMetric/Smoothness
++#
++
++APPEND_SET(HEADERS
++ QualityMetric/Smoothness/EdgeLengthQualityMetric.hpp
++ QualityMetric/Smoothness/EdgeLengthRangeQualityMetric.hpp
++ )
++
++APPEND_SET(SOURCES
++ QualityMetric/Smoothness/EdgeLengthQualityMetric.cpp
++ QualityMetric/Smoothness/EdgeLengthRangeQualityMetric.cpp
++ )
++
++#
++# src/QualityMetric/TMP
++#
++
++APPEND_SET(HEADERS
++ QualityMetric/TMP/AffineMapMetric.hpp
++ QualityMetric/TMP/TMPQualityMetric.hpp
++ QualityMetric/TMP/AWQualityMetric.hpp
++ QualityMetric/TMP/TQualityMetric.hpp
++ )
++
++APPEND_SET(SOURCES
++ QualityMetric/TMP/AffineMapMetric.cpp
++ QualityMetric/TMP/TargetMetricUtil.cpp
++ QualityMetric/TMP/TargetMetricUtil.hpp
++ QualityMetric/TMP/TMPQualityMetric.cpp
++ QualityMetric/TMP/AWQualityMetric.cpp
++ QualityMetric/TMP/TQualityMetric.cpp
++ )
++
++#
++# src/QualityMetric/Untangle
++#
++
++APPEND_SET(HEADERS
++ QualityMetric/Untangle/UntangleBetaQualityMetric.hpp
++ )
++
++APPEND_SET(SOURCES
++ QualityMetric/Untangle/UntangleBetaQualityMetric.cpp
++ )
++
++#
++# src/QualityMetric/Volume
++#
++
++APPEND_SET(HEADERS
++ QualityMetric/Volume/EdgeLengthMetric.hpp
++ QualityMetric/Volume/LocalSizeQualityMetric.hpp
++ QualityMetric/Volume/SizeMetric.hpp
++ )
++
++APPEND_SET(SOURCES
++ QualityMetric/Volume/EdgeLengthMetric.cpp
++ QualityMetric/Volume/LocalSizeQualityMetric.cpp
++ QualityMetric/Volume/SizeMetric.cpp
++ )
++
++
++#
++# src/TargetMetric
++#
++
++APPEND_SET(HEADERS
++ TargetMetric/AWMetric.hpp
++ TargetMetric/TMetric.hpp
++ )
++
++APPEND_SET(SOURCES
++ TargetMetric/TMPCommon.hpp
++ TargetMetric/TMPDerivs.hpp
++ TargetMetric/AWMetric.cpp
++ TargetMetric/TMetric.cpp
++ )
++
++
++#
++# src/TargetMetric/Misc
++#
++
++APPEND_SET(HEADERS
++ TargetMetric/Misc/InvTransBarrier.hpp
++ TargetMetric/Misc/TMixed.hpp
++ TargetMetric/Misc/TOffset.hpp
++ TargetMetric/Misc/TPower2.hpp
++ TargetMetric/Misc/TScale.hpp
++ TargetMetric/Misc/TSquared.hpp
++ TargetMetric/Misc/TSum.hpp
++ )
++
++APPEND_SET(SOURCES
++ TargetMetric/Misc/InvTransBarrier.cpp
++ TargetMetric/Misc/TMixed.cpp
++ TargetMetric/Misc/TOffset.cpp
++ TargetMetric/Misc/TPower2.cpp
++ TargetMetric/Misc/TScale.cpp
++ TargetMetric/Misc/TSquared.cpp
++ TargetMetric/Misc/TSum.cpp
++ )
++
++#
++# src/TargetMetric/Shape
++#
++
++APPEND_SET(HEADERS
++ TargetMetric/Shape/AWShape2DB1.hpp
++ TargetMetric/Shape/AWShape2DNB1.hpp
++ TargetMetric/Shape/AWShape2DNB2.hpp
++ TargetMetric/Shape/TInverseMeanRatio.hpp
++ TargetMetric/Shape/TShape2DNB2.hpp
++ TargetMetric/Shape/TShape3DB2.hpp
++ TargetMetric/Shape/TShapeB1.hpp
++ TargetMetric/Shape/TShapeNB1.hpp
++ )
++
++APPEND_SET(SOURCES
++ TargetMetric/Shape/AWShape2DB1.cpp
++ TargetMetric/Shape/AWShape2DNB1.cpp
++ TargetMetric/Shape/AWShape2DNB2.cpp
++ TargetMetric/Shape/TInverseMeanRatio.cpp
++ TargetMetric/Shape/TShape2DNB2.cpp
++ TargetMetric/Shape/TShape3DB2.cpp
++ TargetMetric/Shape/TShapeB1.cpp
++ TargetMetric/Shape/TShapeNB1.cpp
++ )
++
++#
++# src/TargetMetric/ShapeOrient
++#
++
++APPEND_SET(HEADERS
++ TargetMetric/ShapeOrient/AWShapeOrientNB1.hpp
++ TargetMetric/ShapeOrient/TShapeOrientB1.hpp
++ TargetMetric/ShapeOrient/TShapeOrientB2.hpp
++ TargetMetric/ShapeOrient/TShapeOrientNB1.hpp
++ TargetMetric/ShapeOrient/TShapeOrientNB2.hpp
++ )
++
++APPEND_SET(SOURCES
++ TargetMetric/ShapeOrient/AWShapeOrientNB1.cpp
++ TargetMetric/ShapeOrient/TShapeOrientB1.cpp
++ TargetMetric/ShapeOrient/TShapeOrientB2.cpp
++ TargetMetric/ShapeOrient/TShapeOrientNB1.cpp
++ TargetMetric/ShapeOrient/TShapeOrientNB2.cpp
++ )
++
++#
++# src/TargetMetric/ShapeSize
++#
++
++APPEND_SET(HEADERS
++ TargetMetric/ShapeSize/AWShapeSizeB1.hpp
++ TargetMetric/ShapeSize/TShapeSize2DB2.hpp
++ TargetMetric/ShapeSize/TShapeSize2DNB1.hpp
++ TargetMetric/ShapeSize/TShapeSize2DNB2.hpp
++ TargetMetric/ShapeSize/TShapeSize3DB2.hpp
++ TargetMetric/ShapeSize/TShapeSize3DB4.hpp
++ TargetMetric/ShapeSize/TShapeSize3DNB1.hpp
++ TargetMetric/ShapeSize/TShapeSizeB1.hpp
++ TargetMetric/ShapeSize/TShapeSizeB3.hpp
++ TargetMetric/ShapeSize/TShapeSizeNB3.hpp
++ )
++
++APPEND_SET(SOURCES
++ TargetMetric/ShapeSize/AWShapeSizeB1.cpp
++ TargetMetric/ShapeSize/TShapeSize2DB2.cpp
++ TargetMetric/ShapeSize/TShapeSize2DNB1.cpp
++ TargetMetric/ShapeSize/TShapeSize2DNB2.cpp
++ TargetMetric/ShapeSize/TShapeSize3DB2.cpp
++ TargetMetric/ShapeSize/TShapeSize3DB4.cpp
++ TargetMetric/ShapeSize/TShapeSize3DNB1.cpp
++ TargetMetric/ShapeSize/TShapeSizeB1.cpp
++ TargetMetric/ShapeSize/TShapeSizeB3.cpp
++ TargetMetric/ShapeSize/TShapeSizeNB3.cpp
++ )
++
++#
++# src/TargetMetric/ShapeSizeOrient
++#
++
++APPEND_SET(HEADERS
++ TargetMetric/ShapeSizeOrient/AWShapeSizeOrientNB1.hpp
++ TargetMetric/ShapeSizeOrient/TShapeSizeOrientB1.hpp
++ TargetMetric/ShapeSizeOrient/TShapeSizeOrientB2.hpp
++ TargetMetric/ShapeSizeOrient/TShapeSizeOrientNB1.hpp
++ )
++
++APPEND_SET(SOURCES
++ TargetMetric/ShapeSizeOrient/AWShapeSizeOrientNB1.cpp
++ TargetMetric/ShapeSizeOrient/TShapeSizeOrientB1.cpp
++ TargetMetric/ShapeSizeOrient/TShapeSizeOrientB2.cpp
++ TargetMetric/ShapeSizeOrient/TShapeSizeOrientNB1.cpp
++ )
++
++#
++# src/TargetMetric/Size
++#
++
++APPEND_SET(HEADERS
++ TargetMetric/Size/AWSizeB1.hpp
++ TargetMetric/Size/AWSizeNB1.hpp
++ TargetMetric/Size/TSizeB1.hpp
++ TargetMetric/Size/TSizeNB1.hpp
++ TargetMetric/Size/TTau.hpp
++ )
++
++APPEND_SET(SOURCES
++ TargetMetric/Size/AWSizeB1.cpp
++ TargetMetric/Size/AWSizeNB1.cpp
++ TargetMetric/Size/TSizeB1.cpp
++ TargetMetric/Size/TSizeNB1.cpp
++ TargetMetric/Size/TTau.cpp
++ )
++
++#
++# src/TargetMetric/Untangle
++#
++
++APPEND_SET(HEADERS
++ TargetMetric/Untangle/AWUntangleBeta.hpp
++ TargetMetric/Untangle/TUntangle1.hpp
++ TargetMetric/Untangle/TUntangleBeta.hpp
++ TargetMetric/Untangle/TUntangleMu.hpp
++ )
++
++APPEND_SET(SOURCES
++ TargetMetric/Untangle/AWUntangleBeta.cpp
++ TargetMetric/Untangle/TUntangle1.cpp
++ TargetMetric/Untangle/TUntangleBeta.cpp
++ TargetMetric/Untangle/TUntangleMu.cpp
++ )
++
++#
++# src/TargetCalculator
++#
++
++APPEND_SET(HEADERS
++ TargetCalculator/CachingTargetCalculator.hpp
++ TargetCalculator/IdealShapeTarget.hpp
++ TargetCalculator/InverseMetricWeight.hpp
++ TargetCalculator/JacobianCalculator.hpp
++ TargetCalculator/LambdaTarget.hpp
++ TargetCalculator/LambdaConstant.hpp
++ TargetCalculator/LVQDTargetCalculator.hpp
++ TargetCalculator/MetricWeight.hpp
++ TargetCalculator/RefMeshTargetCalculator.hpp
++ TargetCalculator/ReferenceMesh.hpp
++ TargetCalculator/RefSizeTargetCalculator.hpp
++ TargetCalculator/RemainingWeight.hpp
++ TargetCalculator/TargetCalculator.hpp
++ TargetCalculator/TargetReader.hpp
++ TargetCalculator/TargetWriter.hpp
++ TargetCalculator/TetDihedralWeight.hpp
++ TargetCalculator/WeightCalculator.hpp
++ TargetCalculator/WeightReader.hpp
++ )
++
++APPEND_SET(SOURCES
++ TargetCalculator/CachingTargetCalculator.cpp
++ TargetCalculator/IdealShapeTarget.cpp
++ TargetCalculator/InverseMetricWeight.cpp
++ TargetCalculator/JacobianCalculator.cpp
++ TargetCalculator/LambdaTarget.cpp
++ TargetCalculator/LambdaConstant.cpp
++ TargetCalculator/LVQDTargetCalculator.cpp
++ TargetCalculator/MetricWeight.cpp
++ TargetCalculator/RefMeshTargetCalculator.cpp
++ TargetCalculator/ReferenceMesh.cpp
++ TargetCalculator/RefSizeTargetCalculator.cpp
++ TargetCalculator/RemainingWeight.cpp
++ TargetCalculator/TargetCalculator.cpp
++ TargetCalculator/TargetReader.cpp
++ TargetCalculator/TargetWriter.cpp
++ TargetCalculator/TetDihedralWeight.cpp
++ TargetCalculator/WeightCalculator.cpp
++ TargetCalculator/WeightReader.cpp
++ )
++
++#
++# itaps
++#
++
++
++#the key here is that the generated files have to be marked as generated using the SET_SOURCE_FILES_PROPERTIES
++#command.
++#
++# Generate Fortran name mangling headers
++#
++# ADD_CUSTOM_COMMAND(
++# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/../itaps/iMesh_protos.h
++# COMMAND ${CMAKE_COMMAND}
++# ARGS -D input_file:STRING=${CMAKE_CURRENT_SOURCE_DIR}/../itaps/iMesh.h
++# -D output_file:STRING=${CMAKE_CURRENT_BINARY_DIR}/../itaps/iMesh_protos.h
++# -D prefix:STRING=iMesh
++# -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ITAPSFortranMangling.cmake
++# DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../itaps/iMesh.h
++# COMMENT "Running custom command"
++# )
++# SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../itaps/iMesh_protos.h PROPERTIES GENERATED true)
++#
++# ADD_CUSTOM_COMMAND(
++# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/../itaps/iMeshP_protos.h
++# COMMAND ${CMAKE_COMMAND}
++# ARGS -D input_file:STRING=${CMAKE_CURRENT_SOURCE_DIR}/../itaps/iMeshP.h
++# -D output_file:STRING=${CMAKE_CURRENT_BINARY_DIR}/../itaps/iMeshP_protos.h
++# -D prefix:STRING=iMeshP
++# -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ITAPSFortranMangling.cmake
++# DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../itaps/iMeshP.h
++# COMMENT "Running custom command"
++# )
++# SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../itaps/iMeshP_protos.h PROPERTIES GENERATED true)
++#
++# ADD_CUSTOM_COMMAND(
++# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/../itaps/iGeom_protos.h
++# COMMAND ${CMAKE_COMMAND}
++# ARGS -D input_file:STRING=${CMAKE_CURRENT_SOURCE_DIR}/../itaps/iGeom.h
++# -D output_file:STRING=${CMAKE_CURRENT_BINARY_DIR}/../itaps/iGeom_protos.h
++# -D prefix:STRING=iGeom
++# -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ITAPSFortranMangling.cmake
++# DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../itaps/iGeom.h
++# COMMENT "Running custom command"
++# )
++# SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../itaps/iMeshP_protos.h PROPERTIES GENERATED true)
++#
++# ADD_CUSTOM_COMMAND(
++# OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/../itaps/iRel_protos.h
++# COMMAND ${CMAKE_COMMAND}
++# ARGS -D input_file:STRING=${CMAKE_CURRENT_SOURCE_DIR}/../itaps/iRel.h
++# -D output_file:STRING=${CMAKE_CURRENT_BINARY_DIR}/../itaps/iRel_protos.h
++# -D prefix:STRING=iRel
++# -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/ITAPSFortranMangling.cmake
++# DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../itaps/iRel.h
++# COMMENT "Running custom command"
++# )
++# SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../itaps/iMeshP_protos.h PROPERTIES GENERATED true)
++#
++#
++#APPEND_SET(HEADERS
++# ../itaps/iBase.h
++# ../itaps/iBase_FCDefs.h
++# ../itaps/iMesh.h
++# ${CMAKE_CURRENT_BINARY_DIR}/../itaps/iMesh_protos.h
++# ../itaps/iMeshP.h
++# ${CMAKE_CURRENT_BINARY_DIR}/../itaps/iMeshP_protos.h
++# ../itaps/iGeom.h
++# ${CMAKE_CURRENT_BINARY_DIR}/../itaps/iGeom_protos.h
++# ../itaps/iRel.h
++# ${CMAKE_CURRENT_BINARY_DIR}/../itaps/iRel_protos.h
++# )
++
++
++#
++# Create the Mesquite_all_headers.hpp file.
++#
++
++SET( all_file ${CMAKE_CURRENT_BINARY_DIR}/include/Mesquite_all_headers.hpp )
++# Cannot do this correctly because list if all headers is too long
++# of a command-line argument for some platforms (e.g. Windows.)
++# Instead, use less optimial solution (doesn't automatically update.)
++#
++#ADD_CUSTOM_COMMAND(
++# OUTPUT ${all_file}
++# COMMAND ${CMAKE_COMMAND}
++# ARGS -D output_file:STRING=${all_file}
++# -D headers:STRING="${HEADERS}"
++# -P ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/GenerateAllHeaders.cmake
++# DEPENDS ${HEADERS}
++# COMMENT "Generating Mesquite_all_headers.hpp" )
++#
++SET_SOURCE_FILES_PROPERTIES(${all_file} PROPERTIES GENERATED true)
++#
++file( WRITE ${all_file} "#ifndef MESQUITE_ALL_HEADERS_HPP\n#define MESQUITE_ALL_HEADERS_HPP\n" )
++foreach( header ${HEADERS} )
++ string( REGEX MATCH "[^/]+\\.h(pp)?" file ${header} )
++ file( APPEND ${all_file} "#include \"${file}\"\n")
++endforeach()
++file( APPEND ${all_file} "#endif\n" )
++
++
++
++#last thing to do is add then newly created header
++APPEND_SET(HEADERS ${all_file} )
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ mesquite
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ )
++
++MACRO(APPEND_DEFINE VARNAME OPT_FLAG)
++ IF (${OPT_FLAG})
++ SET(${VARNAME} "${${VARNAME}} -D${OPT_FLAG}")
++ ENDIF()
++ENDMACRO()
++
++# s/MESQUITE_DLL_EXPORTS/MESQUITE_STATIC_LIB/ if building static library
++IF(${PACKAGE_NAME}_ENABLE_SHARED)
++ SET( MESQUITE_LIB_DEFINES "${MESQUITE_DEFINES} -DMESQUITE_DLL_EXPORTS" )
++ELSE()
++ SET( MESQUITE_LIB_DEFINES "${MESQUITE_DEFINES} -DMESQUITE_STATIC_LIB" )
++ENDIF()
++SET_SOURCE_FILES_PROPERTIES( ${SOURCES} COMPILE_FLAGS ${MESQUITE_LIB_DEFINES} )
++
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/mesquite/utils/CMakeLists.txt trilinos-10.8.5.dfsg/packages/mesquite/utils/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/mesquite/utils/CMakeLists.txt 2012-01-09 18:05:50.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/mesquite/utils/CMakeLists.txt 2012-02-06 14:18:48.259074987 +0100
@@ -32,7 +32,7 @@
IF (NOT ${PROJECT_NAME} STREQUAL "Mesquite")
@@ -1017,10 +4076,9 @@
IF(${PACKAGE_NAME}_ENABLE_SHARED)
SET( MESQUITE_UTIL_DEFINES "${MESQUITE_DEFINES}" )
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/ml/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/ml/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/ml/src/CMakeLists.txt 2012-01-09 18:05:32.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/ml/src/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -311,7 +311,7 @@
#
@@ -1030,10 +4088,354 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/ml/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/ml/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/ml/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/ml/src/CMakeLists.txt.orig 2012-02-06 12:48:02.179267614 +0100
+@@ -0,0 +1,317 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_PETSC)
++SET(HAVE_PETSC ${${PACKAGE_NAME}_ENABLE_PETSC})
++
++PACKAGE_CONFIGURE_FILE(ml_config.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/ml_config.h
++ )
++
++#
++# Core files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Include)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Comm)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Coarsen)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/FEGrid)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Main)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Smoother)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Krylov)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Operator)
++
++APPEND_SET(HEADERS
++ Include/ml_defs.h
++ Comm/ml_comm.h
++ Include/ml_include.h
++ Include/ml_common.h
++ Coarsen/ml_amg_genP.h
++ Coarsen/ml_amg.h
++ Coarsen/ml_agg_genP.h
++ Coarsen/ml_agg_min_energy.h
++ Coarsen/ml_check.h
++ Coarsen/ml_aggregate.h
++ Coarsen/ml_ggraph.h
++ FEGrid/ml_mapper.h
++ FEGrid/ml_gridagx.h
++ FEGrid/ml_pde.h
++ FEGrid/ml_bdrypts.h
++ Coarsen/ml_agg_reitzinger.h
++ Coarsen/ml_agg_METIS.h
++ Coarsen/ml_agg_user.h
++ Coarsen/ml_agg_VBMETIS.h
++ Coarsen/ml_agg_Zoltan.h
++ Coarsen/ml_agg_ParMETIS.h
++ Coarsen/ml_qr_fix.h
++ FEGrid/ml_gridfunc.h
++ FEGrid/ml_setup.h
++ FEGrid/ml_elementagx.h
++ FEGrid/ml_grid.h
++ Main/ml_struct.h
++ Main/ml_seg_precond.h
++ Main/ml_1level.h
++ Main/mli_solver.h
++ Main/ml_ggb.h
++ Main/ml_viz_stats.h
++ Comm/ml_comminfoagx.h
++ Comm/ml_comminfoop.h
++ Smoother/ml_csolve.h
++ Smoother/ml_mls.h
++ Smoother/ml_smoother.h
++ Smoother/ml_solver.h
++ Smoother/ml_superlu.h
++ Smoother/ml_xxt.h
++ Smoother/ml_xyt.h
++ Krylov/ml_bicgstabl.h
++ Krylov/ml_cg.h
++ Krylov/ml_gmres.h
++ Krylov/ml_krylov.h
++ Operator/ml_mat_formats.h
++ Operator/ml_operatoragx.h
++ Operator/ml_operator_blockmat.h
++ Operator/ml_operator.h
++ Operator/ml_op_utils.h
++ Operator/ml_rap.h
++ )
++
++APPEND_SET(SOURCES
++ Coarsen/ml_agg_uncoupled.c
++ Coarsen/ml_amg.c
++ Coarsen/ml_agg_coupled.c
++ Coarsen/ml_amg_genP.c
++ Coarsen/ml_check.c
++ Coarsen/ml_agg_dd.c
++ Coarsen/ml_agg_genP.c
++ Coarsen/ml_agg_min_energy.cpp
++ Coarsen/ml_amg_MIS.c
++ Coarsen/ml_agg_MIS.c
++ Coarsen/ml_agg_METIS.c
++ Coarsen/ml_agg_user.c
++ Coarsen/ml_agg_VBMETIS.c
++ Coarsen/ml_agg_Zoltan.c
++ Coarsen/ml_agg_ParMETIS.c
++ Coarsen/ml_aggregate.c
++ Coarsen/ml_ggraph.c
++ Coarsen/ml_agg_reitzinger.c
++ Coarsen/ml_qr_fix.c
++ FEGrid/ml_gridagx.c
++ FEGrid/ml_pde.c
++ FEGrid/ml_bdrypts.c
++ FEGrid/ml_grid.c
++ FEGrid/ml_gridfunc.c
++ FEGrid/ml_setup.c
++ FEGrid/ml_elementagx.c
++ FEGrid/ml_get_basis.c
++ FEGrid/ml_mapper.c
++ Main/ml_struct.c
++ Main/driver.c
++ Main/mli_solver.c
++ Main/ml_seg_precond.c
++ Main/ml_ggb.c
++ Comm/ml_comm.c
++ Comm/ml_comminfoagx.c
++ Comm/ml_comminfoop.c
++ Comm/ml_exch_row.c
++ Smoother/ml_csolve.c
++ Smoother/ml_smoother.c
++ Smoother/ml_solver.c
++ Smoother/ml_superlu.c
++ Smoother/ml_xxt.c
++ Smoother/ml_xyt.c
++ Krylov/ml_bicgstabl.c
++ Krylov/ml_cg.c
++ Krylov/ml_gmres.c
++ Krylov/ml_krylov.c
++ Operator/ml_matmat_mult.c
++ Operator/ml_operatoragx.c
++ Operator/ml_operator_blockmat.c
++ Operator/ml_operator.c
++ Operator/ml_op_utils.c
++ Operator/ml_rap.c
++ Operator/ml_mat_formats.c
++ Operator/ml_rap_utils.c
++ )
++
++#
++# util files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utils)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/RefMaxwell)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/MatrixFree)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/MLAPI)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/LevelWrap)
++
++APPEND_SET(HEADERS
++ Utils/ml_aztec_utils.h
++ Utils/ml_epetra_utils.h
++ Utils/ml_utils.h
++ Utils/ml_memory.h
++ Utils/ml_agg_info.h
++ Utils/ml_aztec_lapack.h
++ Utils/ml_rbm.h
++ Utils/ml_read_utils.h
++ Utils/ml_superlu_lapack.h
++ Utils/ml_epetra_operator.h
++ Utils/ml_twogrid_analysis.h
++ Utils/ml_intlist.h
++ Utils/ml_vec.h
++ Utils/ml_lapack.h
++ Utils/ml_utils.h
++ Utils/ml_eigf2c.h
++ Utils/ml_vampir.h
++ Utils/ml_viz_opendx.h
++ Utils/ml_viz_xyz.h
++ Utils/ml_viz_vtk.h
++ Utils/ml_amesos.h
++ Utils/ml_amesos_wrap.h
++ Utils/ml_ifpack.h
++ Utils/ml_ifpack_wrap.h
++ Utils/ml_self.h
++ Utils/ml_self_wrap.h
++ Utils/ml_epetra_preconditioner.h
++ Utils/ml_anasazi.h
++ Utils/ml_epetra.h
++ Utils/ml_MultiLevelOperator.h
++ Utils/ml_MultiLevelPreconditioner.h
++ Utils/ml_RowMatrix.h
++ Utils/ml_FilterType.h
++ Utils/ml_DD_prec.h
++ Utils/ml_Ifpack_ML.h
++ Utils/ml_Epetra_wrap_CrsGraph_as_RowMatrix.H
++ Utils/ml_Preconditioner.h
++ Utils/Epetra_Operator_With_MatMat.h
++ Utils/Epetra_Multi_CrsMatrix.h
++ Utils/ml_ValidateParameters.h
++ Utils/ml_petsc.h
++ RefMaxwell/ml_EdgeMatrixFreePreconditioner.h
++ RefMaxwell/ml_FaceMatrixFreePreconditioner.h
++ RefMaxwell/ml_RefMaxwell_11_Operator.h
++ RefMaxwell/ml_RefMaxwell.h
++ MatrixFree/ml_MatrixFreePreconditioner.h
++ MatrixFree/ml_ElementByElement_SingleElement.h
++ MLAPI/MLAPI.h
++ MLAPI/MLAPI_Aggregation.h
++ MLAPI/MLAPI_BaseObject.h
++ MLAPI/MLAPI_BaseOperator.h
++ MLAPI/MLAPI_CompObject.h
++ MLAPI/MLAPI_Defaults.h
++ MLAPI/MLAPI_Eig.h
++ MLAPI/MLAPI_EpetraBaseOperator.h
++ MLAPI/MLAPI_Expressions.h
++ MLAPI/MLAPI_Gallery.h
++ MLAPI/MLAPI_InverseOperator.h
++ MLAPI/MLAPI_LoadBalanceInverseOperator.h
++ MLAPI/MLAPI_Krylov.h
++ MLAPI/MLAPI_MATLABStream.h
++ MLAPI/MLAPI_SerialMatrix.h
++ MLAPI/MLAPI_DistributedMatrix.h
++ MLAPI/MLAPI_MultiLevelSA.h
++ MLAPI/MLAPI_MultiLevelAdaptiveSA.h
++ MLAPI/MLAPI_MultiVector.h
++ MLAPI/MLAPI_MultiVector_Utils.h
++ MLAPI/MLAPI_Operator_Box.h
++ MLAPI/MLAPI_Operator.h
++ MLAPI/MLAPI_LoadBalanceOperator.h
++ MLAPI/MLAPI_Operator_Utils.h
++ MLAPI/MLAPI_Space.h
++ MLAPI/MLAPI_TimeObject.h
++ MLAPI/MLAPI_Workspace.h
++ MLAPI/MLAPI_Error.h
++ MLAPI/MLAPI_SAMIS.h
++ MLAPI/MLAPI_LinearCombinations.h
++ MLAPI/MLAPI_BaseLinearCombination.h
++ LevelWrap/ml_LevelWrap.h
++ )
++
++APPEND_SET(SOURCES
++ Utils/ml_rbm.c
++ Utils/ml_aztec_utils.c
++ Utils/ml_read_utils.c
++ Utils/ml_twogrid_analysis.c
++ Utils/ml_epetra_utils.cpp
++ Utils/ml_utils.c
++ Utils/ml_intlist.c
++ Utils/ml_vec.c
++ Utils/ml_memory.c
++ Utils/ml_eigf2c.c
++ Utils/ml_agg_info.c
++ Utils/ml_viz_opendx.c
++ Utils/ml_viz_xyz.c
++ Utils/ml_viz_vtk.c
++ Utils/ml_amesos.c
++ Utils/ml_amesos_wrap.cpp
++ Utils/ml_ifpack.c
++ Utils/ml_ifpack_wrap.cpp
++ Utils/ml_self.c
++ Utils/ml_self_wrap.cpp
++ Utils/ml_MultiLevelPreconditioner.cpp
++ Utils/ml_MultiLevelPreconditioner_Filtering.cpp
++ Utils/ml_MultiLevelPreconditioner_NullSpace.cpp
++ Utils/ml_MultiLevelPreconditioner_Defaults.cpp
++ Utils/ml_MultiLevelPreconditioner_Smoothers.cpp
++ Utils/ml_MultiLevelPreconditioner_Viz.cpp
++ Utils/ml_MultiLevelPreconditioner_Adapt.cpp
++ Utils/ml_MultiLevelPreconditioner_Analyze.cpp
++ Utils/ml_MultiLevelPreconditioner_Test.cpp
++ Utils/ml_MultiLevelPreconditioner_Aux.cpp
++ Utils/ml_MultiLevelPreconditioner_XML.cpp
++ Utils/ml_anasazi.cpp
++ Utils/ml_MultiLevelOperator.cpp
++ Utils/ml_RowMatrix.cpp
++ Utils/ml_DD_prec.cpp
++ Utils/Epetra_Multi_CrsMatrix.cpp
++ Utils/ml_ValidateParameters.cpp
++ RefMaxwell/ml_FaceMatrixFreePreconditioner.cpp
++ RefMaxwell/ml_EdgeMatrixFreePreconditioner.cpp
++ RefMaxwell/ml_RefMaxwell_11_Operator.cpp
++ RefMaxwell/ml_RefMaxwell.cpp
++ MatrixFree/ml_MatrixFreePreconditioner.cpp
++ MLAPI/MLAPI_Defaults.cpp
++ MLAPI/MLAPI_Gallery.cpp
++ MLAPI/MLAPI_InverseOperator.cpp
++ MLAPI/MLAPI_LoadBalanceInverseOperator.cpp
++ MLAPI/MLAPI_Operator_Utils.cpp
++ MLAPI/MLAPI_Eig.cpp
++ MLAPI/MLAPI_Krylov.cpp
++ MLAPI/MLAPI_Workspace.cpp
++ MLAPI/MLAPI_Expressions.cpp
++ MLAPI/MLAPI_MultiVector_Utils.cpp
++ MLAPI/MLAPI_BaseObject.cpp
++ MLAPI/MLAPI_Aggregation.cpp
++ MLAPI/MLAPI_Error.cpp
++ MLAPI/MLAPI_DistributedMatrix.cpp
++ MLAPI/MLAPI_SAMIS.cpp
++ MLAPI/MLAPI_LinearCombinations.cpp
++ LevelWrap/ml_LevelWrap.cpp
++ )
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ ml
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/moertel/src/mesh/CMakeLists.txt trilinos-10.8.5.dfsg/packages/moertel/src/mesh/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/moertel/src/mesh/CMakeLists.txt 2012-01-09 18:08:01.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/moertel/src/mesh/CMakeLists.txt 2012-02-06 14:34:54.063040824 +0100
+@@ -37,7 +37,7 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- moertelmesh
++ trilinos_moertelmesh
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/moertel/src/mortar/CMakeLists.txt trilinos-10.8.5.dfsg/packages/moertel/src/mortar/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/moertel/src/mortar/CMakeLists.txt 2012-01-09 18:08:01.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/moertel/src/mortar/CMakeLists.txt 2012-02-06 14:34:59.231040642 +0100
+@@ -96,7 +96,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- moertel
++ trilinos_moertel
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/moocho/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/moocho/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/moocho/src/CMakeLists.txt 2012-01-09 18:04:54.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/moocho/src/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -198,7 +198,7 @@
#
@@ -1043,10 +4445,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt trilinos-10.8.5.dfsg/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt 2012-01-09 18:04:41.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -64,7 +64,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST( ThyraDiagonalQuadraticResponseOnlyOpt
SOURCES
@@ -1056,10 +4457,84 @@
NUM_MPI_PROCS 1
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/moocho/thyra/example/DiagonalQuadraticResponseOnlyOpt/CMakeLists.txt.orig 2012-02-06 12:48:01.707267631 +0100
+@@ -0,0 +1,71 @@
++INCLUDE(PackageAddExecutableAndTest)
++
++
++#
++# EpetraExtDiagonalQuadraticResponseOnlyOpt
++#
++
++
++SET(EPETRAEXT_DQROO_DIR
++ ${PACKAGE_SOURCE_DIR}/../epetraext/example/model_evaluator/DiagonalQuadraticResponseOnlyOpt)
++
++SET(THYRA_DQROME_DIR
++ thyra/core/test/nonlinear/models)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${EPETRAEXT_DQROO_DIR})
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${PACKAGE_BINARY_DIR}/../${THYRA_DQROME_DIR})
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${PACKAGE_SOURCE_DIR}/../${THYRA_DQROME_DIR})
++
++
++PACKAGE_ADD_EXECUTABLE_AND_TEST( EpetraExtDiagonalQuadraticResponseOnlyOpt
++ SOURCES
++ EpetraExtDiagonalQuadraticResponseOnlyOptMain.cpp
++ ${EPETRAEXT_DQROO_DIR}/EpetraExt_DiagonalQuadraticResponseOnlyModelEvaluator.cpp
++ NUM_MPI_PROCS 1
++ )
++
++
++PACKAGE_ADD_TEST( EpetraExtDiagonalQuadraticResponseOnlyOpt
++ NAME_POSTFIX np1
++ ARGS "--local-dim=100 --pt=0.0 --p0=2.0"
++ NUM_MPI_PROCS 1
++ )
++
++
++PACKAGE_ADD_TEST( EpetraExtDiagonalQuadraticResponseOnlyOpt
++ NAME_POSTFIX np2
++ ARGS "--local-dim=100 --pt=0.0 --p0=2.0"
++ COMM mpi
++ NUM_MPI_PROCS 2
++ )
++
++
++PACKAGE_ADD_TEST( EpetraExtDiagonalQuadraticResponseOnlyOpt
++ NAME_POSTFIX np3
++ ARGS "--local-dim=100 --pt=0.0 --p0=2.0"
++ COMM mpi
++ NUM_MPI_PROCS 3
++ )
++
++
++PACKAGE_ADD_TEST( EpetraExtDiagonalQuadraticResponseOnlyOpt
++ NAME_POSTFIX np4
++ ARGS "--local-dim=100 --pt=0.0 --p0=2.0"
++ COMM mpi
++ NUM_MPI_PROCS 4
++ )
++
++
++#
++# ThyraDiagonalQuadraticResponseOnlyOpt
++#
++
++
++PACKAGE_ADD_EXECUTABLE_AND_TEST( ThyraDiagonalQuadraticResponseOnlyOpt
++ SOURCES
++ ThyraDiagonalQuadraticResponseOnlyOptMain.cpp
++ DEPLIBS thyra_nonlinear_test_models
++ NUM_MPI_PROCS 1
++ )
++
++# ToDo: Add some more tests ...
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/moocho/thyra/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/moocho/thyra/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/moocho/thyra/src/CMakeLists.txt 2012-01-09 18:04:41.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/moocho/thyra/src/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -21,8 +21,8 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
@@ -1071,10 +4546,9 @@
- DEPLIBS moocho
+ DEPLIBS trilinos_moocho
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/src/CMakeLists.txt 2012-01-09 18:06:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/src/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -210,7 +210,7 @@
#
@@ -1084,10 +4558,9 @@
HEADERS ${HEADERS}
NOINSTALLHEADERS ${NOINSTALLHEADERS}
SOURCES ${SOURCES}
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/src-belos/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/src-belos/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/src-belos/CMakeLists.txt 2012-01-09 18:05:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/src-belos/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -23,7 +23,7 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_BELOS)
@@ -1097,10 +4570,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/src-epetra/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/src-epetra/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/src-epetra/CMakeLists.txt 2012-01-09 18:05:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/src-epetra/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -62,9 +62,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA)
@@ -1113,10 +4585,9 @@
+ DEPLIBS trilinos_nox
)
ENDIF()
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/src-lapack/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/src-lapack/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/src-lapack/CMakeLists.txt 2012-01-09 18:06:08.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/src-lapack/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -22,9 +22,9 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK)
@@ -1129,10 +4600,9 @@
+ DEPLIBS trilinos_nox
)
ENDIF()
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/src-loca/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/src-loca/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/src-loca/src/CMakeLists.txt 2012-01-09 18:06:08.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/src-loca/src/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -351,10 +351,10 @@
IF (NOX_ENABLE_LOCA)
@@ -1146,10 +4616,9 @@
+ DEPLIBS trilinos_nox
)
ENDIF()
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/src-loca/src-epetra/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/src-loca/src-epetra/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/src-loca/src-epetra/CMakeLists.txt 2012-01-09 18:06:05.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/src-loca/src-epetra/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -81,9 +81,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
@@ -1162,10 +4631,9 @@
+ DEPLIBS trilinos_loca trilinos_noxepetra trilinos_nox
)
ENDIF()
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/src-loca/src-lapack/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/src-loca/src-lapack/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/src-loca/src-lapack/CMakeLists.txt 2012-01-09 18:06:08.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/src-loca/src-lapack/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -24,9 +24,9 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA)
@@ -1178,10 +4646,9 @@
+ DEPLIBS trilinos_loca trilinos_noxlapack trilinos_nox
)
ENDIF()
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/src-loca/src-mf/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/src-loca/src-mf/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/src-loca/src-mf/CMakeLists.txt 2012-01-09 18:06:05.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/src-loca/src-mf/CMakeLists.txt 2012-02-06 14:41:58.507025810 +0100
@@ -22,9 +22,9 @@
IF (NOX_ENABLE_LOCA AND NOX_ENABLE_MF)
@@ -1194,10 +4661,43 @@
+ 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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/src-loca/src-mf/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/nox/src-loca/src-mf/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/nox/src-loca/src-mf/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/src-loca/src-mf/CMakeLists.txt.orig 2012-02-06 12:48:01.895267624 +0100
+@@ -0,0 +1,30 @@
++
++INCLUDE(PackageLibraryMacros)
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++# LOCA MF library
++APPEND_SET(HEADERS
++ MFLOCA.H
++ LOCA_MultiStepper.H
++ )
++
++APPEND_SET(SOURCES
++ MFLOCA.C
++ MFLOCANVector.C
++ MFLOCANSpace.C
++ MFLOCANRegion.C
++ LOCA_MultiStepper.C
++ )
++
++IF (NOX_ENABLE_LOCA AND NOX_ENABLE_MF)
++ PACKAGE_ADD_LIBRARY(
++ locamf
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ DEPLIBS loca
++ )
++ENDIF()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/src-loca/src-thyra/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/src-loca/src-thyra/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/src-loca/src-thyra/CMakeLists.txt 2012-01-09 18:06:08.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/src-loca/src-thyra/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -19,9 +19,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA AND NOX_ENABLE_LOCA)
@@ -1210,10 +4710,9 @@
+ DEPLIBS trilinos_loca trilinos_noxthyra trilinos_nox
)
ENDIF()
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/src-petsc/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/src-petsc/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/src-petsc/CMakeLists.txt 2012-01-09 18:05:58.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/src-petsc/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -25,9 +25,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_PETSC)
@@ -1228,10 +4727,9 @@
-ENDIF()
\ No newline at end of file
+ENDIF()
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/src-thyra/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/src-thyra/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/src-thyra/CMakeLists.txt 2012-01-09 18:06:08.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/src-thyra/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -24,9 +24,9 @@
IF (NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA)
@@ -1246,10 +4744,9 @@
-ENDIF()
\ No newline at end of file
+ENDIF()
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt 2012-01-09 18:06:02.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -18,7 +18,7 @@
Problem_Interface.C
brussCont.C
@@ -1268,10 +4765,61 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Brusselator/CMakeLists.txt.orig 2012-02-06 12:48:01.907267624 +0100
+@@ -0,0 +1,48 @@
++
++INCLUDE(PackageAddExecutableAndTest)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../../utils)
++
++IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_Brusselator
++ SOURCES
++ Basis.H
++ Basis.C
++ Brusselator.H
++ Brusselator.C
++ Problem_Interface.H
++ Problem_Interface.C
++ brussCont.C
++ COMM serial mpi
++ DEPLIBS noxtestutils
++ NUM_MPI_PROCS 2
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ IF(NOX_ENABLE_EpetraExt)
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_BrusselatorHopf
++ SOURCES
++ Basis.H
++ Basis.C
++ Brusselator.H
++ Brusselator.C
++ Problem_Interface.H
++ Problem_Interface.C
++ brussHopfCont.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ ENDIF()
++
++ENDIF()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt 2012-01-09 18:06:03.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -19,7 +19,7 @@
brussXYZT_ifpack.C
COMM serial mpi
@@ -1353,10 +4901,177 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Brusselator_xyzt/CMakeLists.txt.orig 2012-02-06 12:48:01.907267624 +0100
+@@ -0,0 +1,164 @@
++
++INCLUDE(PackageAddExecutableAndTest)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../../utils)
++
++IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_EpetraExt AND NOX_ENABLE_LOCA)
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_BrussXYZT_Ifpack
++ SOURCES
++ Basis.H
++ Basis.C
++ Brusselator.H
++ Brusselator.C
++ Problem_Interface.H
++ Problem_Interface.C
++ brussXYZT_ifpack.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_BrussXYZT_Global
++ SOURCES
++ Basis.H
++ Basis.C
++ Brusselator.H
++ Brusselator.C
++ Problem_Interface.H
++ Problem_Interface.C
++ brussXYZT_global.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_BrussXYZT_Sequential
++ SOURCES
++ Basis.H
++ Basis.C
++ Brusselator.H
++ Brusselator.C
++ Problem_Interface.H
++ Problem_Interface.C
++ brussXYZT_sequential.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_BrussXYZT_SequentialIPS
++ SOURCES
++ Basis.H
++ Basis.C
++ Brusselator.H
++ Brusselator.C
++ Problem_Interface.H
++ Problem_Interface.C
++ brussXYZT_sequential_IPS.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_BrussXYZT_SequentialOPS
++ SOURCES
++ Basis.H
++ Basis.C
++ Brusselator.H
++ Brusselator.C
++ Problem_Interface.H
++ Problem_Interface.C
++ brussXYZT_sequential_OPS.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_BrussXYZT_Parallel
++ SOURCES
++ Basis.H
++ Basis.C
++ Brusselator.H
++ Brusselator.C
++ Problem_Interface.H
++ Problem_Interface.C
++ brussXYZT_parallel.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ # Commented out from original Makefile.am
++ # breaks mpirun
++# PACKAGE_ADD_EXECUTABLE_AND_TEST(
++# LOCA_BrussXYZT_Parareal
++# SOURCES
++# Basis.H
++# Basis.C
++# Brusselator.H
++# Brusselator.C
++# Problem_Interface.H
++# Problem_Interface.C
++# brussXYZT_parareal.C
++# COMM serial mpi
++# DEPLIBS noxtestutils
++# ARGS -v
++# PASS_REGULAR_EXPRESSION "All tests passed"
++# )
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_BrussXYZT_BlockDiagonal
++ SOURCES
++ Basis.H
++ Basis.C
++ Brusselator.H
++ Brusselator.C
++ Problem_Interface.H
++ Problem_Interface.C
++ brussXYZT_blockdiagonal.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_BrussXYZT_bdsdt
++ SOURCES
++ Basis.H
++ Basis.C
++ Brusselator.H
++ Brusselator.C
++ Problem_Interface.H
++ Problem_Interface.C
++ brussXYZT_bdsdt.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ENDIF()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt 2012-01-09 18:06:03.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -17,7 +17,7 @@
multipointTcubed.C
COMM mpi
@@ -1366,10 +5081,38 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_MultiPoint_Tcubed/CMakeLists.txt.orig 2012-02-06 12:48:01.907267624 +0100
+@@ -0,0 +1,25 @@
++
++INCLUDE(PackageAddExecutableAndTest)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../../utils)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../LOCA_TestProblems)
++
++IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_EpetraExt AND NOX_ENABLE_LOCA AND TPL_ENABLE_MPI)
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_MultiPointTcubed
++ SOURCES
++ Problem_Interface_MP.H
++ Problem_Interface_MP.C
++ multipointTcubed.C
++ COMM mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils locaepetratestproblems
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ENDIF()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt 2012-01-09 18:06:03.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -15,7 +15,7 @@
Pitchfork.C
COMM serial mpi
@@ -1379,10 +5122,36 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Pitchfork/CMakeLists.txt.orig 2012-02-06 12:48:01.911267624 +0100
+@@ -0,0 +1,23 @@
++
++INCLUDE(PackageAddExecutableAndTest)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../../utils)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../LOCA_TestProblems)
++
++IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_Pitchfork
++ SOURCES
++ Pitchfork.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils locaepetratestproblems
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ENDIF()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt 2012-01-09 18:06:02.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt 2012-02-06 15:29:45.322924412 +0100
@@ -15,7 +15,7 @@
Tcubed.C
COMM serial mpi
@@ -1419,10 +5188,71 @@
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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_Tcubed/CMakeLists.txt.orig 2012-02-06 12:48:01.907267624 +0100
+@@ -0,0 +1,58 @@
++
++INCLUDE(PackageAddExecutableAndTest)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../../utils)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../LOCA_TestProblems)
++
++IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_Tcubed
++ SOURCES
++ Tcubed.C
++ COMM serial mpi
++ NUM_MPI_PROCS 4
++ DEPLIBS noxtestutils locaepetratestproblems
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_TcubedConstraint
++ SOURCES
++ Tcubed_constraint.C
++ COMM serial mpi
++ NUM_MPI_PROCS 4
++ DEPLIBS noxtestutils locaepetratestproblems
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_TcubedTP
++ SOURCES
++ TcubedTP.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils locaepetratestproblems
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ IF(NOX_ENABLE_Stratimikos)
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_TcubedTP_stratimikos
++ SOURCES
++ TcubedTP_stratimikos.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils locaepetratestproblems
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++ ENDIF()
++
++ENDIF()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt 2012-01-09 18:06:02.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_TestProblems/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -28,11 +28,11 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
@@ -1437,10 +5267,9 @@
)
ENDIF()
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt 2012-01-09 18:06:02.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -15,7 +15,7 @@
HouseholderBorderedSolve.C
COMM serial mpi
@@ -1495,10 +5324,91 @@
ARGS -v
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/LOCA_UnitTests/CMakeLists.txt.orig 2012-02-06 12:48:01.907267624 +0100
+@@ -0,0 +1,78 @@
++
++INCLUDE(PackageAddExecutableAndTest)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../LOCA_TestProblems)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../../utils)
++
++IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND NOX_ENABLE_LOCA)
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_HouseholderBorderedSolve
++ SOURCES
++ HouseholderBorderedSolve.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils locaepetratestproblems
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_HouseholderTransposeBorderedSolve
++ SOURCES
++ HouseholderTransposeBorderedSolve.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils locaepetratestproblems
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_TransposeSolve
++ SOURCES
++ TransposeSolve.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils locaepetratestproblems
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_CompositeConstraint
++ SOURCES
++ CompositeConstraint.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils locaepetratestproblems
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_CompositeConstraintMVDX
++ SOURCES
++ CompositeConstraintMVDX.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils locaepetratestproblems
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ LOCA_NaturalContResidualFills
++ SOURCES
++ NaturalContResidualFills.C
++ COMM serial mpi
++ NUM_MPI_PROCS 2
++ DEPLIBS noxtestutils locaepetratestproblems
++ ARGS -v
++ PASS_REGULAR_EXPRESSION "All tests passed"
++ )
++
++ENDIF()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt 2012-01-09 18:06:03.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/NOX_Operators/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -13,7 +13,7 @@
test.C
Laplace2D.C
@@ -1517,10 +5427,9 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt 2012-01-09 18:06:03.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/epetra/NOX_Vector/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Epetra_Vector
@@ -1539,10 +5448,9 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt 2012-01-09 18:06:05.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/lapack/LOCA_ChanProblem/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -10,7 +10,7 @@
SOURCES ChanContinuation.C
COMM serial mpi
@@ -1570,10 +5478,9 @@
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt 2012-01-09 18:06:04.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/lapack/LOCA_TestProblems/CMakeLists.txt 2012-02-06 14:40:57.259027978 +0100
@@ -21,11 +21,11 @@
IF(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_LAPACK AND NOX_ENABLE_LOCA)
@@ -1588,10 +5495,9 @@
)
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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt 2012-01-09 18:06:04.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/lapack/LOCA_UnitTests/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -10,7 +10,7 @@
SOURCES BorderedSolve.C
COMM serial mpi
@@ -1628,10 +5534,9 @@
PASS_REGULAR_EXPRESSION "All tests passed"
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/lapack/NOX/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/lapack/NOX/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/lapack/NOX/CMakeLists.txt 2012-01-09 18:06:04.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/lapack/NOX/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
rosenbrock
@@ -1650,10 +5555,9 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/lapack/StatusTests/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/lapack/StatusTests/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/lapack/StatusTests/CMakeLists.txt 2012-01-09 18:06:05.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/lapack/StatusTests/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
StatusTests
@@ -1663,10 +5567,9 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt 2012-01-09 18:06:04.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/lapack/UserDefinedObjects/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
UserDefinedObjects
@@ -1676,10 +5579,9 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/nox/test/utils/CMakeLists.txt trilinos-10.8.5.dfsg/packages/nox/test/utils/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/nox/test/utils/CMakeLists.txt 2012-01-09 18:06:04.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/nox/test/utils/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -4,7 +4,7 @@
SET(HEADERS "")
@@ -1703,16 +5605,15 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
TESTONLY
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/optika/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/optika/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/optika/src/CMakeLists.txt 2012-01-09 18:08:03.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/optika/src/CMakeLists.txt 2012-02-06 14:19:30.435073492 +0100
@@ -28,10 +28,10 @@
PACKAGE_ADD_LIBRARY(
- optika
-+ trilinos_optika
++ trilinos_optika
HEADERS ${MOC_HDRS} ${HDRS}
SOURCES ${SRCS} ${MOC_SRCS}
DEPLIBS
@@ -1720,10 +5621,29 @@
+ trilinos_teuchos ${TPL_QT_LIBRARIES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/optika/test/unit_tests/CMakeLists.txt trilinos-10.8.5.dfsg/packages/optika/test/unit_tests/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/optika/test/unit_tests/CMakeLists.txt 2012-01-09 18:08:03.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/optika/test/unit_tests/CMakeLists.txt 2012-02-06 15:12:02.574962002 +0100
+@@ -32,7 +32,7 @@
+ GUI_UnitTests
+ SOURCES GUI_UnitTests.cpp GUI_UnitTests.moc
+ FAIL_REGULAR_EXPRESSION "FAIL!"
+- DEPLIBS teuchos ${TPL_QT_LIBRARIES}
++ DEPLIBS trilinos_teuchos ${TPL_QT_LIBRARIES}
+ )
+
+ PACKAGE_COPY_FILES_TO_BINARY_DIR(GUI_dep_test_copies
+@@ -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}
+ )
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/optipack/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/optipack/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/optipack/src/CMakeLists.txt 2012-01-09 18:04:01.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/optipack/src/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -29,7 +29,7 @@
#
@@ -1733,10 +5653,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/optipack/test/NonlinearCG/CMakeLists.txt trilinos-10.8.5.dfsg/packages/optipack/test/NonlinearCG/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/optipack/test/NonlinearCG/CMakeLists.txt 2012-01-09 18:04:01.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/optipack/test/NonlinearCG/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -8,7 +8,7 @@
SOURCES
NonlinearCG_UnitTests.cpp
@@ -1746,10 +5665,36 @@
COMM serial mpi
ARGS
" " # Make sure default works
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/optipack/test/NonlinearCG/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/optipack/test/NonlinearCG/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/optipack/test/NonlinearCG/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/optipack/test/NonlinearCG/CMakeLists.txt.orig 2012-02-06 12:48:01.847267626 +0100
+@@ -0,0 +1,23 @@
++INCLUDE(PackageAddExecutableAndTest)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${PACKAGE_BINARY_DIR}/../thyra/core/test/nonlinear/models)
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${PACKAGE_SOURCE_DIR}/../thyra/core/test/nonlinear/models)
++
++PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ NonlinearCGUnitTests
++ SOURCES
++ NonlinearCG_UnitTests.cpp
++ ${PACKAGE_SOURCE_DIR}/../teuchos/test/UnitTest/Teuchos_StandardUnitTestMain.cpp
++ DEPLIBS thyra_nonlinear_test_models
++ COMM serial mpi
++ ARGS
++ " " # Make sure default works
++ "--nonlin-max-iters=14" # Default solver type is FR
++ "--solver-type=PR+ --nonlin-max-iters=14 --nonlin-error-tol=5e-2"
++ "--solver-type=HS --nonlin-max-iters=14"
++ NUM_MPI_PROCS 4
++ STANDARD_PASS_OUTPUT
++ )
++
++# NOTE: The FR-PR method does not seem to be working?
++#"--solver-type=FR-PR --nonlin-max-iters=45 --nonlin-error-tol=1e-2 --nonlin-solve-tol=1e-4"
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/pamgen/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/pamgen/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/pamgen/src/CMakeLists.txt 2012-01-09 18:07:03.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/pamgen/src/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -208,13 +208,13 @@
#
@@ -1766,11 +5711,22 @@
HEADERS ${PE_HEADERS}
SOURCES ${PE_SOURCES}
)
-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 @@
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/phalanx/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/phalanx/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/phalanx/src/CMakeLists.txt 2012-01-09 18:05:11.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/phalanx/src/CMakeLists.txt 2012-02-06 14:47:50.119013377 +0100
+@@ -89,17 +89,17 @@
+ # INCLUDE_DIRECTORIES(${Kokkos_INCLUDE_DIRS})
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/gpu)
+ PACKAGE_ADD_CUDA_LIBRARY(
+- phalanx_test_cuda
++ trilinos_phalanx_test_cuda
+ SOURCES gpu/Phalanx_GPU.cu
+ )
+- SET(Phalanx_CUDA_LIBRARY phalanx_test_cuda)
++ SET(Phalanx_CUDA_LIBRARY trilinos_phalanx_test_cuda)
+ ELSE()
+ SET(Phalanx_CUDA_LIBRARY "")
+ ENDIF()
PACKAGE_ADD_LIBRARY(
@@ -1779,10 +5735,120 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/phalanx/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/phalanx/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/phalanx/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/phalanx/src/CMakeLists.txt.orig 2012-02-06 12:48:01.763267629 +0100
+@@ -0,0 +1,107 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.hpp)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.hpp
++ )
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++# FAD
++APPEND_SET(HEADERS
++ Phalanx.hpp
++ Phalanx_Allocator_Contiguous.hpp
++ Phalanx_Allocator_New.hpp
++ Phalanx_ConfigDefs.hpp
++ Phalanx_DataContainer_Base_Def.hpp
++ Phalanx_DataContainer_Base.hpp
++ Phalanx_DataContainer_Def.hpp
++ Phalanx_DataContainer.hpp
++ Phalanx_DataContainer_TemplateManager.hpp
++ Phalanx_DataLayout_MDALayout_Def.hpp
++ Phalanx_DataLayout_MDALayout.hpp
++ Phalanx_DataLayout.hpp
++ Phalanx_DoxygenDocumentation.hpp
++ Phalanx_EvaluationContainer_Base_Def.hpp
++ Phalanx_EvaluationContainer_Base.hpp
++ Phalanx_EvaluationContainer_Def.hpp
++ Phalanx_EvaluationContainer.hpp
++ Phalanx_EvaluationContainer_TemplateBuilder.hpp
++ Phalanx_EvaluationContainer_TemplateManager.hpp
++ Phalanx_Evaluator_Base.hpp
++ Phalanx_Evaluator_Derived.hpp
++ Phalanx_Evaluator_Factory_Def.hpp
++ Phalanx_Evaluator_Factory.hpp
++ Phalanx_Evaluator_Factory_UFO.hpp
++ Phalanx_Evaluator.hpp
++ Phalanx_Evaluator_Macros.hpp
++ Phalanx_Evaluator_Manager_Def.hpp
++ Phalanx_Evaluator_Manager.hpp
++ Phalanx_Evaluator_TemplateBuilder.hpp
++ Phalanx_Evaluator_TemplateManager.hpp
++ Phalanx_Evaluator_Utilities.hpp
++ Phalanx_Evaluator_WithBaseImpl_Def.hpp
++ Phalanx_Evaluator_WithBaseImpl.hpp
++ Phalanx_Field_Def.hpp
++ Phalanx_Field.hpp
++ Phalanx_FieldManager_Def.hpp
++ Phalanx_FieldManager.hpp
++ Phalanx_FieldTag.hpp
++ Phalanx_FieldTag_STL_Functors.hpp
++ Phalanx_FieldTag_Tag_Def.hpp
++ Phalanx_FieldTag_Tag.hpp
++ Phalanx_MDField_Def.hpp
++ Phalanx_MDField.hpp
++ Phalanx_Print_Utilities.hpp
++ Phalanx_TemplateIterator.hpp
++ Phalanx_TemplateManager_Def.hpp
++ Phalanx_TemplateManager.hpp
++ Phalanx_Traits_Base.hpp
++ Phalanx_TypeStrings.hpp
++ Phalanx_Version.hpp
++ )
++
++APPEND_SET(SOURCES
++ Phalanx_DataLayout.cpp
++ Phalanx_FieldTag.cpp
++ )
++#
++# C) Define the targets for package's library(s)
++#
++
++IF (Phalanx_ENABLE_Thrust)
++ # FINISH: REMOVE THIS IF IT ISN'T NEEDED
++ # INCLUDE_DIRECTORIES(${Kokkos_INCLUDE_DIRS})
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/gpu)
++ PACKAGE_ADD_CUDA_LIBRARY(
++ phalanx_test_cuda
++ SOURCES gpu/Phalanx_GPU.cu
++ )
++ SET(Phalanx_CUDA_LIBRARY phalanx_test_cuda)
++ELSE()
++ SET(Phalanx_CUDA_LIBRARY "")
++ENDIF()
++
++
++PACKAGE_ADD_LIBRARY(
++ phalanx
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ DEPLIBS ${Phalanx_CUDA_LIBRARY}
++ )
++
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/phalanx/test/DataContainer/CMakeLists.txt trilinos-10.8.5.dfsg/packages/phalanx/test/DataContainer/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/phalanx/test/DataContainer/CMakeLists.txt 2012-01-09 18:05:11.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/phalanx/test/DataContainer/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -8,8 +8,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
data_container
@@ -1795,10 +5861,9 @@
- )
\ No newline at end of file
+ )
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/phalanx/test/EvaluatorManager/CMakeLists.txt trilinos-10.8.5.dfsg/packages/phalanx/test/EvaluatorManager/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/phalanx/test/EvaluatorManager/CMakeLists.txt 2012-01-09 18:05:11.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/phalanx/test/EvaluatorManager/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
evaluator_manager
@@ -1808,10 +5873,9 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/phalanx/test/Field/CMakeLists.txt trilinos-10.8.5.dfsg/packages/phalanx/test/Field/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/phalanx/test/Field/CMakeLists.txt 2012-01-09 18:05:11.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/phalanx/test/Field/CMakeLists.txt 2012-02-06 13:03:19.271235177 +0100
@@ -9,7 +9,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
field
@@ -1864,10 +5928,9 @@
-#ENDIF(Phalanx_ENABLE_Intrepid)
\ No newline at end of file
+#ENDIF(Phalanx_ENABLE_Intrepid)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/phalanx/test/FieldTag/CMakeLists.txt trilinos-10.8.5.dfsg/packages/phalanx/test/FieldTag/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/phalanx/test/FieldTag/CMakeLists.txt 2012-01-09 18:05:11.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/phalanx/test/FieldTag/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
field_tag
@@ -1877,10 +5940,21 @@
COMM serial mpi
NUM_MPI_PROCS 1
PASS_REGULAR_EXPRESSION "Test passed!"
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/phalanx/test/Graphviz/CMakeLists.txt trilinos-10.8.5.dfsg/packages/phalanx/test/Graphviz/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/phalanx/test/Graphviz/CMakeLists.txt 2012-01-09 18:05:11.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/phalanx/test/Graphviz/CMakeLists.txt 2012-02-06 15:32:52.790917782 +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!"
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt trilinos-10.8.5.dfsg/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt 2012-01-09 18:05:11.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/phalanx/test/IntrepidInteroperability/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -13,10 +13,10 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
intrepid_interoperability
@@ -1895,10 +5969,9 @@
-ENDIF(Phalanx_ENABLE_Intrepid)
\ No newline at end of file
+ENDIF(Phalanx_ENABLE_Intrepid)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/phalanx/test/Performance/Allocators/CMakeLists.txt trilinos-10.8.5.dfsg/packages/phalanx/test/Performance/Allocators/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/phalanx/test/Performance/Allocators/CMakeLists.txt 2012-01-09 18:05:11.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/phalanx/test/Performance/Allocators/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -8,8 +8,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
performance_allocators
@@ -1911,10 +5984,9 @@
- )
\ No newline at end of file
+ )
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt trilinos-10.8.5.dfsg/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt 2012-01-09 18:05:11.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/phalanx/test/Performance/BracketOperator/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -6,8 +6,8 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
performance_bracket_operator
@@ -1927,10 +5999,9 @@
- )
\ No newline at end of file
+ )
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/phalanx/test/Utilities/CMakeLists.txt trilinos-10.8.5.dfsg/packages/phalanx/test/Utilities/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/phalanx/test/Utilities/CMakeLists.txt 2012-01-09 18:05:11.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/phalanx/test/Utilities/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -32,7 +32,7 @@
)
@@ -1952,10 +6023,9 @@
- )
\ No newline at end of file
+ )
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/piro/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/piro/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/piro/src/CMakeLists.txt 2012-01-09 18:06:42.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/piro/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -89,7 +89,7 @@
#
@@ -1965,10 +6035,108 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/piro/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/piro/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/piro/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/piro/src/CMakeLists.txt.orig 2012-02-06 12:48:01.759267629 +0100
+@@ -0,0 +1,95 @@
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.hpp)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.hpp
++ )
++
++#
++# B.1) utilities
++#
++APPEND_SET(HEADERS Piro_ValidPiroParameters.hpp
++ Piro_Version.hpp
++ Piro_Epetra_VelocityVerletSolver.hpp
++ Piro_Epetra_TrapezoidRuleSolver.hpp
++ Piro_Epetra_InvertMassMatrixDecorator.hpp
++ Piro_Epetra_Factory.hpp
++ Piro_ConfigDefs.hpp)
++APPEND_SET(SOURCES Piro_ValidPiroParameters.cpp
++ Piro_Epetra_VelocityVerletSolver.cpp
++ Piro_Epetra_TrapezoidRuleSolver.cpp
++ Piro_Epetra_InvertMassMatrixDecorator.cpp
++ Piro_Epetra_Factory.cpp
++ Piro_Version.cpp)
++
++#
++# B.2) epetra files
++#
++# Optional NOX Dependency (which includes LOCA)
++IF (Piro_ENABLE_NOX)
++ APPEND_SET(HEADERS Piro_Epetra_NOXSolver.hpp
++ Piro_NOXSolver.hpp
++ Piro_NOXSolver_Def.hpp
++ Piro_Epetra_LOCASolver.hpp
++ Piro_Epetra_MatrixFreeDecorator.hpp
++ Piro_Epetra_SensitivityOperator.hpp)
++ APPEND_SET(SOURCES Piro_Epetra_NOXSolver.cpp
++ Piro_Epetra_LOCASolver.cpp
++ Piro_Epetra_MatrixFreeDecorator.cpp
++ Piro_Epetra_SensitivityOperator.cpp)
++ENDIF()
++# Optional Rythmos Dependency
++IF (Piro_ENABLE_Rythmos)
++ APPEND_SET(HEADERS Piro_Epetra_RythmosSolver.hpp
++ Piro_RythmosSolver.hpp
++ Piro_RythmosSolver_Def.hpp)
++ APPEND_SET(SOURCES Piro_Epetra_RythmosSolver.cpp)
++ENDIF()
++
++# Optional StochasticGalerkin capability, depending upon Stokhos and NOX
++IF (Piro_ENABLE_Stokhos AND Piro_ENABLE_NOX)
++ APPEND_SET(HEADERS Piro_Epetra_StokhosNOXObserver.hpp
++ Piro_Epetra_StokhosSolverFactory.hpp
++ Piro_Epetra_StokhosSolver.hpp)
++ APPEND_SET(SOURCES Piro_Epetra_StokhosNOXObserver.cpp
++ Piro_Epetra_StokhosSolverFactory.cpp
++ Piro_Epetra_StokhosSolver.cpp)
++ENDIF()
++#
++
++#
++# B.2) Analysis Tools
++#
++
++IF (Piro_ENABLE_TriKota)
++ ADD_DEFINITIONS(${TRIKOTA_DAKOTA_DEFINITIONS})
++ENDIF()
++
++APPEND_SET(HEADERS Piro_PerformAnalysis.hpp)
++APPEND_SET(SOURCES Piro_PerformAnalysis.cpp)
++
++## DEPRECATED Thyra Namespace in Piro: REMOVE THESE FOR TRILINOS 11.0)
++APPEND_SET(HEADERS Piro_Thyra_PerformAnalysis.hpp)
++APPEND_SET(SOURCES Piro_Thyra_PerformAnalysis.cpp)
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ piro
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/pliris/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/pliris/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/pliris/src/CMakeLists.txt 2012-01-09 18:06:17.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/pliris/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -145,7 +145,7 @@
MESSAGE(" Building the Z Complex library")
ADD_DEFINITIONS(-DZCPLX)
@@ -2005,10 +6173,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/PyTrilinos/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/PyTrilinos/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/PyTrilinos/src/CMakeLists.txt 2012-01-09 18:06:51.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/PyTrilinos/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -182,12 +182,12 @@
#
@@ -2033,10 +6200,356 @@
# Add the header file to the list of additional "make clean" files
LIST(APPEND ADDITIONAL_CLEAN_FILES "${MODULE}PYTHON_wrap.h")
#
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/PyTrilinos/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/PyTrilinos/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/PyTrilinos/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/PyTrilinos/src/CMakeLists.txt.orig 2012-02-06 12:48:01.859267626 +0100
+@@ -0,0 +1,343 @@
++# -*- cmake -*-
++# @HEADER
++# ************************************************************************
++#
++# PyTrilinos: Python Interface to Trilinos
++# Copyright (2009) Sandia Corporation
++#
++# Under terms of Contract DE-AC04-94AL85000, there is a non-exclusive
++# license for use of this work by or on behalf of the U.S. Government.
++#
++# This library is free software; you can redistribute it and/or modify
++# it under the terms of the GNU Lesser General Public License as
++# published by the Free Software Foundation; either version 2.1 of the
++# License, or (at your option) any later version.
++#
++# This library is distributed in the hope that it will be useful, but
++# WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++# Lesser General Public License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public
++# License along with this library; if not, write to the Free Software
++# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
++# USA
++# Questions? Contact Bill Spotz (wfspotz at sandia.gov)
++#
++# ************************************************************************
++# @HEADER
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# Package-specific configuration options
++IF(Trilinos_ENABLE_Epetra)
++ SET(HAVE_EPETRA ON)
++ENDIF(Trilinos_ENABLE_Epetra)
++
++IF(Trilinos_ENABLE_Teuchos)
++ SET(HAVE_TEUCHOS ON)
++ENDIF(Trilinos_ENABLE_Teuchos)
++
++IF(NOX_ENABLE_Epetra)
++ SET(HAVE_NOX_EPETRA ON)
++ENDIF(NOX_ENABLE_Epetra)
++
++IF(NOX_ENABLE_EpetraExt)
++ SET(HAVE_NOX_EPETRAEXT ON)
++ENDIF(NOX_ENABLE_EpetraExt)
++
++IF(TPL_ENABLE_MPI)
++ SET(HAVE_MPI ON)
++ENDIF(TPL_ENABLE_MPI)
++
++PACKAGE_CONFIGURE_FILE(PyTrilinos_config.h)
++
++#
++# On Mac OS X Gnu compilers, add dynamic lookup for undefined symbols
++# to the pytrilinos library and PyTrilinos extension modules
++SET(EXTRA_LINK_ARGS "")
++IF(APPLE)
++ IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
++ APPEND_SET(EXTRA_LINK_ARGS "-undefined dynamic_lookup")
++ ENDIF()
++ENDIF(APPLE)
++
++#
++# Add the current binary and source directories, the python include
++# path, and the NumPy include path to the include directories
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_PATH})
++INCLUDE_DIRECTORIES(${NumPy_INCLUDE_DIR})
++
++#
++# Copy the pyfragments.swg file to the build directory
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/pyfragments.swg.in
++ ${CMAKE_CURRENT_BINARY_DIR}/pyfragments.swg)
++
++#
++# Initialize the headers and sources
++SET(HEADERS "")
++SET(SOURCES "")
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/PyTrilinos_config.h
++ )
++
++#
++# Core PyTrilinos headers and sources
++APPEND_SET(HEADERS
++ PyTrilinos_NumPyImporter.h
++ PyTrilinos_PythonException.h
++ PyTrilinos_Util.h
++ PyTrilinos_FILEstream.h
++ numpy_include.h
++ )
++
++APPEND_SET(SOURCES
++ PyTrilinos_NumPyImporter.cpp
++ PyTrilinos_PythonException.cpp
++ PyTrilinos_Util.cpp
++ PyTrilinos_FILEstream.cpp
++ )
++
++#
++# PyTrilinos + Teuchos headers and sources
++IF(PyTrilinos_ENABLE_Teuchos)
++
++ APPEND_SET(HEADERS
++ PyTrilinos_Teuchos_Util.h
++ )
++
++ APPEND_SET(SOURCES
++ PyTrilinos_Teuchos_Util.cpp
++ )
++
++ENDIF(PyTrilinos_ENABLE_Teuchos)
++
++#
++# PyTrilinos + Epetra headers and sources
++IF(PyTrilinos_ENABLE_Epetra)
++
++ APPEND_SET(HEADERS
++ Epetra_NumPyFEVector.h
++ Epetra_NumPyIntSerialDenseMatrix.h
++ Epetra_NumPyIntSerialDenseVector.h
++ Epetra_NumPyIntVector.h
++ Epetra_NumPyMultiVector.h
++ Epetra_NumPySerialDenseMatrix.h
++ Epetra_NumPySerialSymDenseMatrix.h
++ Epetra_NumPySerialDenseVector.h
++ Epetra_NumPyVector.h
++ PyTrilinos_Epetra_Util.h
++ )
++
++ APPEND_SET(SOURCES
++ Epetra_NumPyFEVector.cpp
++ Epetra_NumPyIntSerialDenseMatrix.cpp
++ Epetra_NumPyIntSerialDenseVector.cpp
++ Epetra_NumPyIntVector.cpp
++ Epetra_NumPyMultiVector.cpp
++ Epetra_NumPySerialDenseMatrix.cpp
++ Epetra_NumPySerialSymDenseMatrix.cpp
++ Epetra_NumPySerialDenseVector.cpp
++ Epetra_NumPyVector.cpp
++ PyTrilinos_Epetra_Util.cpp
++ )
++
++ENDIF(PyTrilinos_ENABLE_Epetra)
++
++#
++# PyTrilinos + EpetraExt headers and sources
++IF(PyTrilinos_ENABLE_EpetraExt)
++
++ APPEND_SET(HEADERS
++ PyTrilinos_EpetraExt_Util.h
++ )
++
++ APPEND_SET(SOURCES
++ PyTrilinos_EpetraExt_Util.cpp
++ )
++
++ENDIF(PyTrilinos_ENABLE_EpetraExt)
++
++#
++# PyTrilinos + ML headers and sources
++IF(PyTrilinos_ENABLE_ML)
++
++ APPEND_SET(HEADERS
++ PyTrilinos_ML_Util.h
++ )
++
++ENDIF(PyTrilinos_ENABLE_ML)
++
++#
++# Define the target for the swig runtime header
++SET(SWIG_RUNTIME swigpyrun.h)
++ADD_CUSTOM_COMMAND(
++ OUTPUT ${SWIG_RUNTIME}
++ COMMAND ${SWIG_EXECUTABLE} -python -external-runtime
++ )
++APPEND_SET(HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${SWIG_RUNTIME})
++
++#
++# Define the targets for the PyTrilinos library
++PACKAGE_ADD_LIBRARY(pytrilinos
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ )
++
++SET_TARGET_PROPERTIES(pytrilinos
++ PROPERTIES LINK_FLAGS "${EXTRA_LINK_ARGS}"
++ )
++
++#
++# Define the PyTrilinos swig setup
++SET(CMAKE_SWIG_FLAGS "")
++GET_FILENAME_COMPONENT(PYTRILINOS_DOXDIR
++ ${CMAKE_CURRENT_SOURCE_DIR}/../doc/Doxygen ABSOLUTE
++ )
++APPEND_SET(CMAKE_SWIG_FLAGS -I${PYTRILINOS_DOXDIR})
++APPEND_SET(CMAKE_SWIG_FLAGS -noproxydel)
++
++#
++# Determine the install directory
++EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; print sys.version[:3]"
++ OUTPUT_VARIABLE PYTHON_VERSION
++ OUTPUT_STRIP_TRAILING_WHITESPACE
++)
++SET(PyTrilinos_INSTALL_DIR
++ ${PyTrilinos_INSTALL_PREFIX}/lib/python${PYTHON_VERSION}/site-packages/PyTrilinos
++ CACHE PATH "The path where PyTrilinos will be installed"
++ )
++MESSAGE(STATUS "PyTrilinos installation path: ${PyTrilinos_INSTALL_DIR}")
++
++#
++# Add the PyTrilinos subdirectory, which is the top-level package
++# directory. This needs to be done before the following loop over the
++# PyTrilinos modules, because of the call to GET_DIRECTORY_PROPERTY().
++ADD_SUBDIRECTORY(PyTrilinos)
++
++#
++# Add the script subdirectory
++ADD_SUBDIRECTORY(scripts)
++
++#
++# Initialize the list of additional clean files
++SET(ADDITIONAL_CLEAN_FILES "")
++
++#
++# Loop over the PyTrilinos-enabled Trilinos modules and define the
++# swig-generated PyTrilinos extension modules
++FOREACH(MODULE ${PyTrilinos_MODULES})
++ # Alternate versions of the module name
++ STRING(TOUPPER ${MODULE} MODULE_UPPER)
++ STRING(REPLACE "." "_" MODULE_NODOT ${MODULE})
++ SET_SOURCE_FILES_PROPERTIES(${MODULE}.i PROPERTIES
++ CPLUSPLUS ON
++ )
++ # Determine the swig module output directory, name and unique target name
++ SWIG_MODULE_GET_OUTDIR_AND_MODULE(${MODULE}.i MODULE_OUTDIR MODULE_NAME)
++ SET(PyTrilinos_TARGET_NAME ${MODULE_NODOT})
++ SWIG_ADD_MODULE(${PyTrilinos_TARGET_NAME}
++ python
++ "${MODULE}.i"
++ "${MODULE_OUTDIR}"
++ "${MODULE_NAME}")
++ SWIG_LINK_LIBRARIES(${PyTrilinos_TARGET_NAME} pytrilinos)
++ # Add the header file to the list of additional "make clean" files
++ LIST(APPEND ADDITIONAL_CLEAN_FILES "${MODULE}PYTHON_wrap.h")
++ #
++ # Choosing the Trilinos libraries to link against, the python module
++ # to byte-compile and the installation rules requires a little bit
++ # of logic.
++ #
++ # PyTrilinos.NOX.Epetra
++ IF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/NOX/Epetra")
++ SET(TRILINOS_LIBS ${NOXEPETRA_LIBRARIES})
++ ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
++ COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/NOX/Epetra/${MODULE_NAME}.py')"
++ COMMENT "Byte compiling NOX/Epetra/${MODULE_NAME}.py"
++ VERBATIM)
++ INSTALL(FILES
++ ${CMAKE_CURRENT_BINARY_DIR}/PyTrilinos/NOX/Epetra/${MODULE_NAME}.py
++ ${CMAKE_CURRENT_BINARY_DIR}/PyTrilinos/NOX/Epetra/${MODULE_NAME}.pyc
++ DESTINATION ${PyTrilinos_INSTALL_DIR}/NOX/Epetra)
++ INSTALL(TARGETS ${PyTrilinos_TARGET_NAME}
++ DESTINATION ${PyTrilinos_INSTALL_DIR}/NOX/Epetra)
++ LIST(APPEND ADDITIONAL_CLEAN_FILES "PyTrilinos/NOX/Epetra/${MODULE_NAME}.pyc")
++ #
++ # PyTrilinos.NOX
++ ELSEIF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/NOX")
++ SET(TRILINOS_LIBS ${NOX_LIBRARIES})
++ ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
++ COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/NOX/${MODULE_NAME}.py')"
++ COMMENT "Byte compiling NOX/${MODULE_NAME}.py"
++ VERBATIM)
++ INSTALL(FILES
++ ${CMAKE_CURRENT_BINARY_DIR}/PyTrilinos/NOX/${MODULE_NAME}.py
++ ${CMAKE_CURRENT_BINARY_DIR}/PyTrilinos/NOX/${MODULE_NAME}.pyc
++ DESTINATION ${PyTrilinos_INSTALL_DIR}/NOX)
++ INSTALL(TARGETS ${PyTrilinos_TARGET_NAME}
++ DESTINATION ${PyTrilinos_INSTALL_DIR}/NOX)
++ LIST(APPEND ADDITIONAL_CLEAN_FILES "PyTrilinos/NOX/${MODULE_NAME}.pyc")
++ #
++ # PyTrilinos.LOCA
++ ELSEIF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/LOCA")
++ SET(TRILINOS_LIBS ${LOCA_LIBRARIES})
++ ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
++ COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/LOCA/${MODULE_NAME}.py')"
++ COMMENT "Byte compiling LOCA/${MODULE_NAME}.py"
++ VERBATIM)
++ INSTALL(FILES
++ ${CMAKE_CURRENT_BINARY_DIR}/PyTrilinos/LOCA/${MODULE_NAME}.py
++ ${CMAKE_CURRENT_BINARY_DIR}/PyTrilinos/LOCA/${MODULE_NAME}.pyc
++ DESTINATION ${PyTrilinos_INSTALL_DIR}/LOCA)
++ INSTALL(TARGETS ${PyTrilinos_TARGET_NAME}
++ DESTINATION ${PyTrilinos_INSTALL_DIR}/LOCA)
++ LIST(APPEND ADDITIONAL_CLEAN_FILES "PyTrilinos/LOCA/${MODULE_NAME}.pyc")
++ #
++ # PyTrilinos.Isorropia
++ ELSEIF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/Isorropia")
++ SET(TRILINOS_LIBS ${ISORROPIA_LIBRARIES})
++ ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
++ COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/Isorropia/${MODULE_NAME}.py')"
++ COMMENT "Byte compiling Isorropia/${MODULE_NAME}.py"
++ VERBATIM)
++ INSTALL(FILES
++ ${CMAKE_CURRENT_BINARY_DIR}/PyTrilinos/Isorropia/${MODULE_NAME}.py
++ ${CMAKE_CURRENT_BINARY_DIR}/PyTrilinos/Isorropia/${MODULE_NAME}.pyc
++ DESTINATION ${PyTrilinos_INSTALL_DIR}/Isorropia)
++ INSTALL(TARGETS ${PyTrilinos_TARGET_NAME}
++ DESTINATION ${PyTrilinos_INSTALL_DIR}/Isorropia)
++ LIST(APPEND ADDITIONAL_CLEAN_FILES "PyTrilinos/Isorropia/${MODULE_NAME}.pyc")
++ #
++ # PyTrilinos
++ ELSE("${MODULE_OUTDIR}")
++ SET(TRILINOS_LIBS ${${MODULE_UPPER}_LIBRARIES})
++ ADD_CUSTOM_COMMAND(TARGET ${PyTrilinos_TARGET_NAME} POST_BUILD
++ COMMAND ${PYTHON_EXECUTABLE} -c "import py_compile; py_compile.compile('PyTrilinos/${MODULE}.py')"
++ COMMENT "Byte compiling ${MODULE}.py"
++ VERBATIM)
++ INSTALL(FILES
++ ${CMAKE_CURRENT_BINARY_DIR}/PyTrilinos/${MODULE_NAME}.py
++ ${CMAKE_CURRENT_BINARY_DIR}/PyTrilinos/${MODULE_NAME}.pyc
++ DESTINATION ${PyTrilinos_INSTALL_DIR})
++ INSTALL(TARGETS ${PyTrilinos_TARGET_NAME}
++ DESTINATION ${PyTrilinos_INSTALL_DIR})
++ LIST(APPEND ADDITIONAL_CLEAN_FILES "PyTrilinos/${MODULE}.pyc")
++ #
++ ENDIF("${MODULE_OUTDIR}" MATCHES "PyTrilinos/NOX/Epetra")
++ SWIG_LINK_LIBRARIES(${PyTrilinos_TARGET_NAME} ${TRILINOS_LIBS})
++ SET_TARGET_PROPERTIES(${PyTrilinos_TARGET_NAME} PROPERTIES
++ LINK_FLAGS "${EXTRA_LINK_ARGS}"
++ )
++ENDFOREACH(MODULE ${PyTrilinos_MODULES})
++
++#
++# Add the additional "make clean" files
++GET_DIRECTORY_PROPERTY(clean_files ADDITIONAL_MAKE_CLEAN_FILES)
++LIST(APPEND clean_files ${ADDITIONAL_CLEAN_FILES})
++LIST(REMOVE_DUPLICATES clean_files)
++LIST(REMOVE_ITEM clean_files "")
++SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${clean_files}")
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rtop/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/rtop/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/rtop/src/CMakeLists.txt 2012-01-09 18:05:55.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rtop/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -77,7 +77,7 @@
#
@@ -2046,10 +6559,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/adapters/gaasp/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/rythmos/adapters/gaasp/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/adapters/gaasp/src/CMakeLists.txt 2012-01-09 18:04:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/adapters/gaasp/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -31,10 +31,10 @@
#
@@ -2063,10 +6575,9 @@
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/adapters/gaasp/test/CMakeLists.txt trilinos-10.8.5.dfsg/packages/rythmos/adapters/gaasp/test/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/adapters/gaasp/test/CMakeLists.txt 2012-01-09 18:04:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/adapters/gaasp/test/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -8,7 +8,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
test_gaasp_adapters
@@ -2076,10 +6587,9 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt 2012-01-09 18:04:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/adapters/gaasp/tpl_src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -27,7 +27,7 @@
#
@@ -2089,10 +6599,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/example/diagonalTransient/CMakeLists.txt trilinos-10.8.5.dfsg/packages/rythmos/example/diagonalTransient/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/example/diagonalTransient/CMakeLists.txt 2012-01-09 18:03:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/example/diagonalTransient/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -12,7 +12,7 @@
PACKAGE_ADD_EXECUTABLE(
diagonalTransient
@@ -2102,10 +6611,257 @@
COMM serial mpi
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/example/diagonalTransient/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/rythmos/example/diagonalTransient/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/example/diagonalTransient/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/example/diagonalTransient/CMakeLists.txt.orig 2012-02-06 12:48:02.059267619 +0100
+@@ -0,0 +1,244 @@
++
++INCLUDE(PackageAddExecutableAndTest)
++INCLUDE(PackageCopyFilesToBinaryDir)
++INCLUDE(MultilineSet)
++
++ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../../../epetraext/example/model_evaluator/DiagonalTransient)
++
++FILE(GLOB SOURCES *.cpp)
++
++PACKAGE_ADD_EXECUTABLE(
++ diagonalTransient
++ SOURCES ${SOURCES}
++ DEPLIBS rythmos_test_models
++ COMM serial mpi
++ )
++
++ASSERT_DEFINED(Stratimikos_ENABLE_Amesos)
++IF (Stratimikos_ENABLE_Amesos)
++
++ SET(STANDARD_TEST_CONFIG
++ COMM serial mpi
++ NUM_MPI_PROCS 1
++ STANDARD_PASS_OUTPUT
++ )
++
++ PACKAGE_ADD_TEST(
++ diagonalTransient
++ NAME diagonalTransient_default
++ ${STANDARD_TEST_CONFIG}
++ )
++
++ MULTILINE_SET(ARGS
++ " --extra-params-file=ExtraParams2.xml"
++ " --final-time=1e-3 --num-time-steps=10 --verb-level=VERB_MEDIUM "
++ )
++ PACKAGE_ADD_TEST(
++ diagonalTransient
++ NAME diagonalTransient_amesos_base
++ ARGS ${ARGS}
++ ${STANDARD_TEST_CONFIG}
++ )
++
++ MULTILINE_SET(ARGS
++ " --extra-params-file=ExtraParams1.xml"
++ " --final-time=1e-3 "
++ " --num-time-steps=10 "
++ " --verb-level=VERB_MEDIUM "
++ )
++ PACKAGE_ADD_TEST(
++ diagonalTransient
++ NAME diagonalTransient_amesos_coeff_s_pi
++ ARGS ${ARGS}
++ ${STANDARD_TEST_CONFIG}
++ )
++
++ MULTILINE_SET(ARGS
++ " --params-file=diagonalTransient.amesos.fwd-sens-solve.n16.p4.xml"
++ " --final-time=1e-4 --num-time-steps=10 --verb-level=VERB_LOW"
++ " --echo-command-line"
++ " --fwd-sens-solve"
++ " --max-state-error=1e-6"
++ " --max-sens-error=1e-6"
++ " --dump-final-solutions"
++ )
++ PACKAGE_ADD_TEST(
++ diagonalTransient
++ NAME diagonalTransient_amesos_fwd-sens_n16_p4
++ ARGS ${ARGS}
++ ${STANDARD_TEST_CONFIG}
++ )
++
++ MULTILINE_SET(ARGS
++ " --params-file=diagonalTransient.amesos.fwd-sens-solve.n1.p1.xml "
++ " --final-time=1e-4 "
++ " --num-time-steps=10 "
++ " --verb-level=VERB_LOW "
++ " --echo-command-line "
++ " --fwd-sens-solve "
++ " --max-state-error=1e-6 "
++ " --max-sens-error=1e-6 "
++ " --dump-final-solutions "
++ )
++ PACKAGE_ADD_TEST(
++ diagonalTransient
++ NAME diagonalTransient_amesos_fwd-sens_n1_p1
++ ARGS ${ARGS}
++ ${STANDARD_TEST_CONFIG}
++ )
++
++ MULTILINE_SET(ARGS
++ " --params-file=diagonalTransient.amesos.fwd-sens-solve.n5.p1.xml"
++ " --final-time=1e-4 --num-time-steps=10 --verb-level=VERB_LOW"
++ " --echo-command-line"
++ " --fwd-sens-solve"
++ " --max-state-error=1e-6"
++ " --max-sens-error=1e-6"
++ " --dump-final-solutions"
++ )
++ PACKAGE_ADD_TEST(
++ diagonalTransient
++ NAME diagonalTransient_amesos_fwd-sens_n5_p1
++ ARGS ${ARGS}
++ ${STANDARD_TEST_CONFIG}
++ )
++
++ MULTILINE_SET(ARGS
++ " --params-file=diagonalTransient.amesos.fwd-BDF-fixed.n1.xml"
++ " --final-time=1e-3 --num-time-steps=10 --verb-level=VERB_EXTREME"
++ " --echo-command-line"
++ " --max-state-error=1e-6"
++ " --dump-final-solutions"
++ " --use-BDF"
++ )
++ PACKAGE_ADD_TEST(
++ diagonalTransient
++ NAME diagonalTransient_amesos_fwd-BDF-fixed
++ ARGS ${ARGS}
++ ${STANDARD_TEST_CONFIG}
++ )
++
++ MULTILINE_SET(ARGS
++ " --params-file=diagonalTransient.amesos.fwd-BDF-variable.n1.xml"
++ " --final-time=1e-4 --num-time-steps=-1 --verb-level=VERB_EXTREME"
++ " --echo-command-line"
++ " --max-state-error=5e-6"
++ " --dump-final-solutions"
++ " --use-BDF"
++ )
++ PACKAGE_ADD_TEST(
++ diagonalTransient
++ NAME diagonalTransient_amesos_fwd-BDF-variable
++ ARGS ${ARGS}
++ ${STANDARD_TEST_CONFIG}
++ )
++
++ MULTILINE_SET(ARGS
++ " --params-file=diagonalTransient.amesos.fwd-sens-solve-BDF.n1.p1.xml"
++ " --final-time=1e-4 --num-time-steps=10 --verb-level=VERB_LOW"
++ " --echo-command-line"
++ " --fwd-sens-solve"
++ " --max-state-error=1e-6"
++ " --max-restate-error=1e-8"
++ " --max-sens-error=1e-6"
++ " --dump-final-solutions"
++ " --use-BDF"
++ )
++ PACKAGE_ADD_TEST(
++ diagonalTransient
++ NAME diagonalTransient_amesos_fwd-sens-BDF
++ ARGS ${ARGS}
++ ${STANDARD_TEST_CONFIG}
++ )
++
++ PACKAGE_COPY_FILES_TO_BINARY_DIR(Example_diagonalTransient_Amesos_CopyFiles
++ DEST_FILES
++ ExtraParams1.xml
++ diagonalTransient.amesos.fwd-sens-solve.n16.p4.xml
++ diagonalTransient.amesos.fwd-sens-solve.n1.p1.xml
++ diagonalTransient.amesos.fwd-sens-solve.n5.p1.xml
++ diagonalTransient.amesos.fwd-BDF-fixed.n1.xml
++ diagonalTransient.amesos.fwd-BDF-variable.n1.xml
++ diagonalTransient.amesos.fwd-sens-solve-BDF.n1.p1.xml
++ SOURCE_PREFIX "_"
++ EXEDEPS diagonalTransient
++ )
++
++ENDIF()
++
++
++ASSERT_DEFINED(Stratimikos_ENABLE_AztecOO)
++IF (Stratimikos_ENABLE_AztecOO)
++
++ SET(STANDARD_TEST_CONFIG
++ COMM serial mpi
++ NUM_MPI_PROCS 1-4
++ STANDARD_PASS_OUTPUT
++ )
++
++ MULTILINE_SET(ARGS
++ " --params-file=diagonalTransient_aztecoo.xml"
++ " --final-time=1e-4 --num-time-steps=-1 --verb-level=VERB_EXTREME"
++ " --echo-command-line"
++ " --max-state-error=5e-6"
++ " --dump-final-solutions"
++ " --use-BDF"
++ )
++ PACKAGE_ADD_TEST(
++ diagonalTransient
++ NAME diagonalTransient_aztecoo
++ ARGS ${ARGS}
++ ${STANDARD_TEST_CONFIG}
++ )
++
++ PACKAGE_COPY_FILES_TO_BINARY_DIR(Example_diagonalTransient_AztecOO_CopyFiles
++ DEST_FILES
++ ExtraParams2.xml
++ diagonalTransient_aztecoo.xml
++ SOURCE_PREFIX "_"
++ EXEDEPS diagonalTransient
++ )
++
++ENDIF()
++
++
++ASSERT_DEFINED(Stratimikos_ENABLE_Belos)
++IF (Stratimikos_ENABLE_Belos)
++
++ MULTILINE_SET(ARGS
++ " --params-file=diagonalTransient.belos.fwd-BE.n2.p2.xml"
++ " --final-time=1e-3 --num-time-steps=10 --verb-level=VERB_EXTREME"
++ )
++ PACKAGE_ADD_TEST(
++ diagonalTransient
++ NAME diagonalTransient_belos_BE
++ ARGS ${ARGS}
++ COMM serial mpi
++ NUM_MPI_PROCS 1-4
++ STANDARD_PASS_OUTPUT
++ )
++
++ MULTILINE_SET(ARGS
++ " --params-file=diagonalTransient.belos.fwd-IRK.n2.p2.xml"
++ " --use-IRK"
++ )
++ PACKAGE_ADD_TEST(
++ diagonalTransient
++ NAME diagonalTransient_belos_IRK
++ ARGS ${ARGS}
++ COMM serial mpi
++ NUM_MPI_PROCS 1
++ STANDARD_PASS_OUTPUT
++ )
++
++ PACKAGE_COPY_FILES_TO_BINARY_DIR(Example_diagonalTransient_Belos_CopyFiles
++ DEST_FILES
++ diagonalTransient.belos.fwd-BE.n2.p2.xml
++ diagonalTransient.belos.fwd-IRK.n2.p2.xml
++ SOURCE_PREFIX "_"
++ EXEDEPS diagonalTransient
++ )
++
++ENDIF()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt trilinos-10.8.5.dfsg/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt 2012-01-09 18:03:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/example/epetra/1Dfem/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
1DfemTransient
@@ -2115,10 +6871,9 @@
COMM serial mpi
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt trilinos-10.8.5.dfsg/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt 2012-01-09 18:03:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -12,7 +12,7 @@
PACKAGE_ADD_EXECUTABLE(
timeDiscretizedBackwardEuler
@@ -2128,10 +6883,64 @@
COMM serial mpi
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/example/timeDiscretizedBackwardEuler/CMakeLists.txt.orig 2012-02-06 12:48:02.059267619 +0100
+@@ -0,0 +1,51 @@
++
++INCLUDE(PackageAddExecutableAndTest)
++INCLUDE(PackageCopyFilesToBinaryDir)
++INCLUDE(MultilineSet)
++
++ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../../../epetraext/example/model_evaluator/DiagonalTransient)
++
++FILE(GLOB SOURCES *.cpp)
++
++PACKAGE_ADD_EXECUTABLE(
++ timeDiscretizedBackwardEuler
++ SOURCES ${SOURCES}
++ DEPLIBS rythmos_test_models
++ COMM serial mpi
++ )
++
++ASSERT_DEFINED(Stratimikos_ENABLE_Amesos)
++IF (Stratimikos_ENABLE_Amesos)
++
++ SET(STANDARD_TEST_CONFIG
++ COMM serial mpi
++ NUM_MPI_PROCS 1
++ STANDARD_PASS_OUTPUT
++ )
++
++ MULTILINE_SET(ARGS
++ " --params-file=timeDiscretizedBackwardEuler1.xml"
++ " --verb-level=VERB_EXTREME"
++ " --num-time-steps=10"
++ " --final-time=1e-3"
++ )
++ PACKAGE_ADD_TEST(
++ timeDiscretizedBackwardEuler
++ NAME timeDiscretizedBackwardEuler_amesos
++ ARGS ${ARGS}
++ XHOSTTYPE AIX
++ ${STANDARD_TEST_CONFIG}
++ )
++
++ PACKAGE_COPY_FILES_TO_BINARY_DIR(Example_timeDiscretizedBackwardEuler_Amesos_CopyFiles
++ DEST_FILES
++ timeDiscretizedBackwardEuler1.xml
++ SOURCE_PREFIX "_"
++ EXEDEPS timeDiscretizedBackwardEuler
++ )
++
++ENDIF()
++
++
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/rythmos/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/src/CMakeLists.txt 2012-01-09 18:03:58.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -31,7 +31,7 @@
#
@@ -2155,10 +6964,9 @@
)
ENDIF()
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/test/Charon/CMakeLists.txt trilinos-10.8.5.dfsg/packages/rythmos/test/Charon/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/test/Charon/CMakeLists.txt 2012-01-09 18:04:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/test/Charon/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -9,7 +9,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
CharonRythmos_UnitTest
@@ -2168,10 +6976,9 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/test/ConvergenceTest/CMakeLists.txt trilinos-10.8.5.dfsg/packages/rythmos/test/ConvergenceTest/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/test/ConvergenceTest/CMakeLists.txt 2012-01-09 18:04:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/test/ConvergenceTest/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -23,7 +23,7 @@
SOURCES
${COMMON_SOURCES}
@@ -2181,10 +6988,9 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt trilinos-10.8.5.dfsg/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt 2012-01-09 18:04:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/test/ExplicitTaylorPolynomialStepper/VanDerPolOscillator/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE(
vdp
@@ -2194,10 +7000,9 @@
COMM serial mpi
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/test/simpleAdjoint/CMakeLists.txt trilinos-10.8.5.dfsg/packages/rythmos/test/simpleAdjoint/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/test/simpleAdjoint/CMakeLists.txt 2012-01-09 18:03:58.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/test/simpleAdjoint/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -12,7 +12,7 @@
PACKAGE_ADD_EXECUTABLE(
simpleAdjoint
@@ -2207,10 +7012,53 @@
COMM serial mpi
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/test/simpleAdjoint/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/rythmos/test/simpleAdjoint/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/test/simpleAdjoint/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/test/simpleAdjoint/CMakeLists.txt.orig 2012-02-06 12:48:02.059267619 +0100
+@@ -0,0 +1,40 @@
++
++INCLUDE(PackageAddExecutableAndTest)
++INCLUDE(PackageCopyFilesToBinaryDir)
++INCLUDE(MultilineSet)
++
++ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
++
++INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR}/../../../epetraext/example/model_evaluator/DiagonalTransient)
++
++FILE(GLOB SOURCES *.cpp)
++
++PACKAGE_ADD_EXECUTABLE(
++ simpleAdjoint
++ SOURCES ${SOURCES}
++ DEPLIBS rythmos_test_models
++ COMM serial mpi
++ )
++
++ASSERT_DEFINED(Stratimikos_ENABLE_Amesos)
++IF (Stratimikos_ENABLE_Amesos)
++
++ PACKAGE_ADD_TEST(
++ simpleAdjoint
++ NAME simpleAdjoint_amesos
++ ARGS
++ "--num-time-steps=10 --soln-verb-level=VERB_EXTREME"
++ "--params-file=simpleAdjoint_n4.xml --num-time-steps=10 --soln-verb-level=VERB_EXTREME"
++ STANDARD_PASS_OUTPUT
++ COMM serial mpi
++ NUM_MPI_PROCS 1
++ )
++
++ PACKAGE_COPY_FILES_TO_BINARY_DIR(Test_simpleAdjoint_CopyFiles
++ DEST_FILES
++ simpleAdjoint_n4.xml
++ SOURCE_PREFIX "_"
++ EXEDEPS simpleAdjoint
++ )
++
++ENDIF()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/test/ThetaStepper/CMakeLists.txt trilinos-10.8.5.dfsg/packages/rythmos/test/ThetaStepper/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/test/ThetaStepper/CMakeLists.txt 2012-01-09 18:04:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/test/ThetaStepper/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -10,7 +10,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ThetaStepper_UnitTest
@@ -2220,19 +7068,9 @@
COMM serial
STANDARD_PASS_OUTPUT
)
-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}
--# DEPLIBS rythmos_test_models
-+# DEPLIBS trilinos_rythmos_test_models
- # COMM serial
- # STANDARD_PASS_OUTPUT
- # )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/rythmos/test/UnitTest/CMakeLists.txt trilinos-10.8.5.dfsg/packages/rythmos/test/UnitTest/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/rythmos/test/UnitTest/CMakeLists.txt 2012-01-09 18:03:59.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/rythmos/test/UnitTest/CMakeLists.txt 2012-02-06 15:19:40.542945803 +0100
@@ -26,7 +26,7 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
ConvergenceTestHelpers_UnitTest
@@ -2530,10 +7368,9 @@
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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/sacado/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/sacado/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/sacado/src/CMakeLists.txt 2012-01-09 18:04:02.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/sacado/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -256,7 +256,7 @@
#
@@ -2543,10 +7380,275 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/sacado/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/sacado/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/sacado/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/sacado/src/CMakeLists.txt.orig 2012-02-06 12:48:01.867267625 +0100
+@@ -0,0 +1,262 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
++ )
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++# FAD
++SET(HEADERS ${HEADERS}
++ Sacado_Fad_GeneralFad.hpp
++ Sacado_Fad_GeneralFadImp.hpp
++ Sacado_Fad_GeneralFadExpr.hpp
++ Sacado_Fad_ExpressionTraits.hpp
++ Sacado_Fad_Expression.hpp
++ Sacado_Fad_Ops.hpp
++ Sacado_Fad_DynamicStorage.hpp
++ Sacado_Fad_DFad.hpp
++ Sacado_Fad_DFadTraits.hpp
++ Sacado_Fad_StaticStorage.hpp
++ Sacado_Fad_SLFad.hpp
++ Sacado_Fad_SLFadTraits.hpp
++ Sacado_Fad_SFad.hpp
++ Sacado_Fad_SFadImp.hpp
++ Sacado_Fad_SFadTraits.hpp
++ Sacado_Fad_MemPool.hpp
++ Sacado_Fad_MemPoolImp.hpp
++ Sacado_Fad_MemPoolManager.hpp
++ Sacado_Fad_MemPoolManagerImp.hpp
++ Sacado_Fad_MemPoolStorage.hpp
++ Sacado_Fad_DMFad.hpp
++ Sacado_Fad_DMFadTraits.hpp
++ Sacado_Fad_DVFad.hpp
++ Sacado_Fad_DVFadTraits.hpp
++ Sacado_Fad_Vector.hpp
++ Sacado_Fad_VectorImp.hpp
++ Sacado_Fad_VectorDynamicStorage.hpp
++ Sacado_Fad_SimpleFad.hpp
++ Sacado_Fad_SimpleFadImp.hpp
++ Sacado_Fad_SimpleFadOps.hpp
++ Sacado_Fad_SimpleFadTraits.hpp
++ )
++
++# ELRFAD
++SET(HEADERS ${HEADERS}
++ Sacado_ELRFad_GeneralFad.hpp
++ Sacado_ELRFad_GeneralFadImp.hpp
++ Sacado_ELRFad_GeneralFadExpr.hpp
++ Sacado_ELRFad_ExpressionTraits.hpp
++ Sacado_ELRFad_Expression.hpp
++ Sacado_ELRFad_Ops.hpp
++ Sacado_ELRFad_DFadTraits.hpp
++ Sacado_ELRFad_DFad.hpp
++ Sacado_ELRFad_SLFad.hpp
++ Sacado_ELRFad_SLFadTraits.hpp
++ Sacado_ELRFad_SFad.hpp
++ Sacado_ELRFad_SFadImp.hpp
++ Sacado_ELRFad_SFadTraits.hpp
++ )
++
++# LFAD
++SET(HEADERS ${HEADERS}
++ Sacado_LFad_LogicalSparse.hpp
++ Sacado_LFad_LogicalSparseImp.hpp
++ Sacado_LFad_LogicalSparseOps.hpp
++ Sacado_LFad_LogicalSparseTraits.hpp
++ Sacado_LFad_ExpressionTraits.hpp
++ )
++
++# CACHEFAD
++SET(HEADERS ${HEADERS}
++ Sacado_CacheFad_GeneralFad.hpp
++ Sacado_CacheFad_GeneralFadImp.hpp
++ Sacado_CacheFad_GeneralFadExpr.hpp
++ Sacado_CacheFad_ExpressionTraits.hpp
++ Sacado_CacheFad_Expression.hpp
++ Sacado_CacheFad_Ops.hpp
++ Sacado_CacheFad_DFadTraits.hpp
++ Sacado_CacheFad_DFad.hpp
++ Sacado_CacheFad_SFadTraits.hpp
++ Sacado_CacheFad_SFad.hpp
++ Sacado_CacheFad_SFadImp.hpp
++ Sacado_CacheFad_SLFadTraits.hpp
++ Sacado_CacheFad_SLFad.hpp
++ )
++
++# ELRCacheFAD
++SET(HEADERS ${HEADERS}
++ Sacado_ELRCacheFad_GeneralFad.hpp
++ Sacado_ELRCacheFad_GeneralFadImp.hpp
++ Sacado_ELRCacheFad_GeneralFadExpr.hpp
++ Sacado_ELRCacheFad_ExpressionTraits.hpp
++ Sacado_ELRCacheFad_Expression.hpp
++ Sacado_ELRCacheFad_Ops.hpp
++ Sacado_ELRCacheFad_DFadTraits.hpp
++ Sacado_ELRCacheFad_DFad.hpp
++ Sacado_ELRCacheFad_SLFad.hpp
++ Sacado_ELRCacheFad_SLFadTraits.hpp
++ Sacado_ELRCacheFad_SFad.hpp
++ Sacado_ELRCacheFad_SFadImp.hpp
++ Sacado_ELRCacheFad_SFadTraits.hpp
++ )
++
++#TAYLOR
++SET(HEADERS ${HEADERS}
++ Sacado_Tay_CacheTaylorTraits.hpp
++ Sacado_Tay_CacheTaylor.hpp
++ Sacado_Tay_CacheTaylorImp.hpp
++ Sacado_Tay_CacheTaylorExpr.hpp
++ Sacado_Tay_CacheTaylorOps.hpp
++ Sacado_Tay_TaylorTraits.hpp
++ Sacado_Tay_Taylor.hpp
++ Sacado_Tay_TaylorImp.hpp
++ )
++
++# RAD
++SET(HEADERS ${HEADERS}
++ Sacado_trad_Traits.hpp
++ Sacado_trad.hpp
++ Sacado_trad2_Traits.hpp
++ Sacado_trad2.hpp
++ Sacado_tradvec_Traits.hpp
++ Sacado_tradvec.hpp
++ Sacado_rad.hpp
++ Sacado_rad2.hpp
++ )
++
++# RAD Sources
++SET(SOURCES ${SOURCES}
++ Sacado_radops.cpp
++ Sacado_radops2.cpp
++ RAD_Const_Warn.c
++ )
++IF(Sacado_ENABLE_UNINIT)
++ SET(SOURCES ${SOURCES}
++ uninit.c
++ )
++ENDIF()
++
++# UTILS
++SET(HEADERS ${HEADERS}
++ Sacado_DynamicArrayTraits.hpp
++ Sacado_StaticArrayTraits.hpp
++ Sacado_Handle.hpp
++ )
++
++IF (${PACKAGE_NAME}_ENABLE_Teuchos)
++
++ # BLAS
++ SET(HEADERS ${HEADERS}
++ Sacado_Fad_BLAS.hpp
++ Sacado_Fad_BLASImp.hpp
++ Sacado_Fad_ScalarTraitsImp.hpp
++ )
++
++ # TEMPLATE
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/template)
++ SET(HEADERS ${HEADERS}
++ template/Sacado_TemplateManager.hpp
++ template/Sacado_TemplateManagerImp.hpp
++ template/Sacado_TemplateIterator.hpp
++ )
++
++ IF (${PACKAGE_NAME}_ENABLE_PARAMLIB)
++
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/parameter)
++ SET(HEADERS ${HEADERS}
++ parameter/Sacado_ParameterFamilyBase.hpp
++ parameter/Sacado_ParameterFamilyBaseImp.hpp
++ parameter/Sacado_ParameterLibraryBase.hpp
++ parameter/Sacado_ParameterLibraryBaseImp.hpp
++ parameter/Sacado_ParameterVectorBase.hpp
++ parameter/Sacado_ScalarParameterEntry.hpp
++ parameter/Sacado_ScalarParameterFamily.hpp
++ parameter/Sacado_ScalarParameterLibrary.hpp
++ parameter/Sacado_ScalarParameterVector.hpp
++ parameter/Sacado_ParameterAccessor.hpp
++ parameter/Sacado_ParameterRegistration.hpp
++ )
++
++ ENDIF(${PACKAGE_NAME}_ENABLE_PARAMLIB)
++
++ENDIF(${PACKAGE_NAME}_ENABLE_Teuchos)
++
++#mpl
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/mpl)
++SET(HEADERS ${HEADERS}
++ mpl/Sacado_mpl_is_same.hpp
++ mpl/Sacado_mpl_disable_if.hpp
++ mpl/Sacado_mpl_if.hpp
++ mpl/Sacado_mpl_none.hpp
++ mpl/Sacado_mpl_begin.hpp
++ mpl/Sacado_mpl_end.hpp
++ mpl/Sacado_mpl_next.hpp
++ mpl/Sacado_mpl_size.hpp
++ mpl/Sacado_mpl_at.hpp
++ mpl/Sacado_mpl_deref.hpp
++ mpl/Sacado_mpl_push_back.hpp
++ mpl/Sacado_mpl_find.hpp
++ mpl/Sacado_mpl_for_each.hpp
++ mpl/Sacado_mpl_vector.hpp
++ mpl/Sacado_mpl_vector_size_spec.hpp
++ mpl/Sacado_mpl_vector_at_spec.hpp
++ mpl/Sacado_mpl_vector_push_back_spec.hpp
++ mpl/Sacado_mpl_integral_c.hpp
++ mpl/Sacado_mpl_range_c.hpp
++ mpl/Sacado_mpl_apply.hpp
++ mpl/Sacado_mpl_apply_wrap.hpp
++ mpl/Sacado_mpl_bind.hpp
++ mpl/Sacado_mpl_has_type.hpp
++ mpl/Sacado_mpl_lambda.hpp
++ mpl/Sacado_mpl_placeholders.hpp
++ mpl/Sacado_mpl_quote.hpp
++ mpl/Sacado_mpl_type_wrap.hpp
++ mpl/Sacado_mpl_is_placeholder.hpp
++ )
++
++# Scalar flop counters
++SET(HEADERS ${HEADERS}
++ Sacado_ScalarFlopCounter.hpp
++ Sacado_ScalarFlopCounterTraits.hpp
++ )
++SET(SOURCES ${SOURCES}
++ Sacado_ScalarFlopCounter.cpp
++ )
++
++# Main library
++SET(HEADERS ${HEADERS}
++ Sacado_ConfigDefs.h
++ Sacado_Version.hpp
++ Sacado_Traits.hpp
++ Sacado.hpp
++ Sacado_MathFunctions.hpp
++ Sacado_cmath.hpp
++ Sacado_dummy_arg.hpp
++ )
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ sacado
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/sacado/test/utils/CMakeLists.txt trilinos-10.8.5.dfsg/packages/sacado/test/utils/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/sacado/test/utils/CMakeLists.txt 2012-01-09 18:04:04.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/sacado/test/utils/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -35,9 +35,9 @@
#
@@ -2559,10 +7661,558 @@
+# DEPLIBS trilinos_sacado
# TESTONLY
# )
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/algebra/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/algebra/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/algebra/CMakeLists.txt 2012-01-09 18:04:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/algebra/CMakeLists.txt 2012-02-06 13:37:52.087161862 +0100
+@@ -21,8 +21,8 @@
+ chkerr.f dbicon.f dbpini.f dofncg.f isize.f makevo.f nxttim.f rdstep.f show.f uglob.f zmfixd.f
+ chkfnc.f dbielb.f dbpnam.f doif.f lnkfnc.f mlist.f opnlog.f remel.f shptim.f uhist.f zmnps.f)
+
+-PACKAGE_ADD_LIBRARY(algebra_app_lib SOURCES ${SOURCES} DEPLIBS supes suplib exodus_for)
+-PACKAGE_ADD_EXECUTABLE(algebra NOEXEPREFIX NOEXESUFFIX HEADERS ${HEADERS} LINKER_LANGUAGE Fortran SOURCES algebra.f DEPLIBS algebra_app_lib COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_algebra_app_lib SOURCES ${SOURCES} DEPLIBS trilinos_supes trilinos_suplib trilinos_exodus_for)
++PACKAGE_ADD_EXECUTABLE(algebra NOEXEPREFIX NOEXESUFFIX HEADERS ${HEADERS} LINKER_LANGUAGE Fortran SOURCES algebra.f DEPLIBS trilinos_algebra_app_lib COMM serial mpi)
+ install_executable(algebra)
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/conjoin/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/conjoin/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/conjoin/CMakeLists.txt 2012-01-09 18:04:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/conjoin/CMakeLists.txt 2012-02-06 13:38:17.411160965 +0100
+@@ -15,8 +15,8 @@
+ SET(SOURCES add_to_log.C GetLongOpt.C smart_assert.C timer.C tokenize.C
+ adler.C ExodusFile.C Internals.C SystemInterface.C to_string.C)
+
+-PACKAGE_ADD_LIBRARY(${CODE}_app_lib SOURCES ${SOURCES} DEPLIBS exodus)
+-PACKAGE_ADD_EXECUTABLE(${CODE} NOEXEPREFIX NOEXESUFFIX SOURCES Conjoin.C DEPLIBS ${CODE}_app_lib COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_${CODE}_app_lib SOURCES ${SOURCES} DEPLIBS trilinos_exodus)
++PACKAGE_ADD_EXECUTABLE(${CODE} NOEXEPREFIX NOEXESUFFIX SOURCES Conjoin.C DEPLIBS trilinos_${CODE}_app_lib COMM serial mpi)
+ install_executable(${CODE})
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/ejoin/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/ejoin/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/ejoin/CMakeLists.txt 2012-01-09 18:04:56.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/ejoin/CMakeLists.txt 2012-02-06 13:29:59.991178560 +0100
+@@ -14,8 +14,8 @@
+ SET(SOURCES add_to_log.C index_sort.C smart_assert.C to_string.C tokenize.C
+ adler.C GetLongOpt.C match_xyz.C SystemInterface.C Vector3.C mapping.C)
+
+-PACKAGE_ADD_LIBRARY(ejoin_app_lib SOURCES ${SOURCES} DEPLIBS Ioss exodus)
+-PACKAGE_ADD_EXECUTABLE(ejoin NOEXEPREFIX NOEXESUFFIX HEADERS ${HEADERS} SOURCES EJoin.C DEPLIBS ejoin_app_lib COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_ejoin_app_lib SOURCES ${SOURCES} DEPLIBS trilinos_Ioss trilinos_exodus)
++PACKAGE_ADD_EXECUTABLE(ejoin NOEXEPREFIX NOEXESUFFIX HEADERS ${HEADERS} SOURCES EJoin.C DEPLIBS trilinos_ejoin_app_lib COMM serial mpi)
+ install_executable(ejoin)
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/epu/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/epu/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/epu/CMakeLists.txt 2012-01-09 18:04:56.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/epu/CMakeLists.txt 2012-02-06 13:38:02.787161482 +0100
+@@ -14,8 +14,8 @@
+ SET(SOURCES ExodusFile.C GetLongOpt.C Internals.C ParallelDisks.C
+ SystemInterface.C tokenize.C smart_assert.C add_to_log.C timer.C to_string.C)
+
+-PACKAGE_ADD_LIBRARY(epu_lib SOURCES ${SOURCES} DEPLIBS exodus)
+-PACKAGE_ADD_EXECUTABLE(epu NOEXEPREFIX NOEXESUFFIX SOURCES epu.C DEPLIBS epu_lib COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_epu_lib SOURCES ${SOURCES} DEPLIBS trilinos_exodus)
++PACKAGE_ADD_EXECUTABLE(epu NOEXEPREFIX NOEXESUFFIX SOURCES epu.C DEPLIBS trilinos_epu_lib COMM serial mpi)
+ install_executable(epu)
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/exo2mat/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/exo2mat/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/exo2mat/CMakeLists.txt 2012-01-09 18:04:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/exo2mat/CMakeLists.txt 2012-02-06 13:35:42.471166447 +0100
+@@ -21,8 +21,8 @@
+ SET(HEADERS "")
+ SET(SOURCES add_to_log.c)
+
+-PACKAGE_ADD_LIBRARY(${CODE}_app_lib SOURCES ${SOURCES} DEPLIBS exodus ${DEPMATLIB})
+-PACKAGE_ADD_EXECUTABLE(${CODE} NOEXEPREFIX NOEXESUFFIX SOURCES exo2mat.c DEPLIBS ${CODE}_app_lib ${DEPMATLIB} COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_${CODE}_app_lib SOURCES ${SOURCES} DEPLIBS trilinos_exodus ${DEPMATLIB})
++PACKAGE_ADD_EXECUTABLE(${CODE} NOEXEPREFIX NOEXESUFFIX SOURCES exo2mat.c DEPLIBS trilinos_${CODE}_app_lib ${DEPMATLIB} COMM serial mpi)
+ install_executable(${CODE})
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/exodiff/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/exodiff/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/exodiff/CMakeLists.txt 2012-01-09 18:04:55.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/exodiff/CMakeLists.txt 2012-02-06 13:32:44.887172726 +0100
+@@ -16,8 +16,8 @@
+ create_file.C map.C smart_assert.C exo_entity.C FileInfo.C
+ add_to_log.C Tolerance.C iqsort.C check.C parsing.C util.C)
+
+-PACKAGE_ADD_LIBRARY(exodiff_app_lib SOURCES ${SOURCES} DEPLIBS exodus)
+-PACKAGE_ADD_EXECUTABLE(exodiff NOEXEPREFIX NOEXESUFFIX SOURCES exodiff.C DEPLIBS exodiff_app_lib COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_exodiff_app_lib SOURCES ${SOURCES} DEPLIBS trilinos_exodus)
++PACKAGE_ADD_EXECUTABLE(exodiff NOEXEPREFIX NOEXESUFFIX SOURCES exodiff.C DEPLIBS trilinos_exodiff_app_lib COMM serial mpi)
+ install_executable(exodiff)
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/exomatlab/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/exomatlab/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/exomatlab/CMakeLists.txt 2012-01-09 18:04:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/exomatlab/CMakeLists.txt 2012-02-06 13:39:05.379159267 +0100
+@@ -13,8 +13,8 @@
+ SET(HEADERS "")
+ SET(SOURCES add_to_log.C tokenize.C GetLongOpt.C SystemInterface.C)
+
+-PACKAGE_ADD_LIBRARY(exomatlab_app_lib SOURCES ${SOURCES} DEPLIBS Ioss)
+-PACKAGE_ADD_EXECUTABLE(exomatlab NOEXEPREFIX NOEXESUFFIX SOURCES exomatlab.C DEPLIBS exomatlab_app_lib COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_exomatlab_app_lib SOURCES ${SOURCES} DEPLIBS trilinos_Ioss)
++PACKAGE_ADD_EXECUTABLE(exomatlab NOEXEPREFIX NOEXESUFFIX SOURCES exomatlab.C DEPLIBS trilinos_exomatlab_app_lib COMM serial mpi)
+ install_executable(exomatlab)
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/exotxt/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/exotxt/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/exotxt/CMakeLists.txt 2012-01-09 18:04:55.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/exotxt/CMakeLists.txt 2012-02-06 13:32:08.951173996 +0100
+@@ -16,8 +16,8 @@
+ dbielb.f dbiqa.f dbpini.f rwpval.f wrinit.f wrnps.f wrxyz.f
+ dbign.f dbiste.f dbvini.f wrelb.f wrmap.f wrqa.f)
+
+-PACKAGE_ADD_LIBRARY(exotxt_app_lib SOURCES ${SOURCES} DEPLIBS supes suplib exodus_for)
+-PACKAGE_ADD_EXECUTABLE(exotxt NOEXEPREFIX NOEXESUFFIX LINKER_LANGUAGE Fortran SOURCES exotxt.f DEPLIBS exotxt_app_lib supes suplib exodus_for COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_exotxt_app_lib SOURCES ${SOURCES} DEPLIBS trilinos_supes trilinos_suplib trilinos_exodus_for)
++PACKAGE_ADD_EXECUTABLE(exotxt NOEXEPREFIX NOEXESUFFIX LINKER_LANGUAGE Fortran SOURCES exotxt.f DEPLIBS trilinos_exotxt_app_lib trilinos_supes trilinos_suplib trilinos_exodus_for COMM serial mpi)
+ install_executable(exotxt)
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/gjoin/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/gjoin/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/gjoin/CMakeLists.txt 2012-01-09 18:04:56.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/gjoin/CMakeLists.txt 2012-02-06 13:31:05.399176244 +0100
+@@ -16,8 +16,8 @@
+ comand.f dbpini.f fixmap.f indexx.f intcnt.f mirss.f munelb.f munxyz.f ordstr.f renelb.f setitl.f zmess.f zmnps.f
+ dbmir1.f dorot.f getall.f inigen.f irennp.f movint.f muness.f offset.f outlog.f renix.f setsta.f zmfixd.f zmxyz.f)
+
+-PACKAGE_ADD_LIBRARY(gjoin_app_lib SOURCES ${SOURCES} DEPLIBS supes suplib exodus_for)
+-PACKAGE_ADD_EXECUTABLE(gjoin NOEXEPREFIX NOEXESUFFIX LINKER_LANGUAGE Fortran SOURCES gjoin.f DEPLIBS gjoin_app_lib COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_gjoin_app_lib SOURCES ${SOURCES} DEPLIBS trilinos_supes trilinos_suplib trilinos_exodus_for)
++PACKAGE_ADD_EXECUTABLE(gjoin NOEXEPREFIX NOEXESUFFIX LINKER_LANGUAGE Fortran SOURCES gjoin.f DEPLIBS trilinos_gjoin_app_lib COMM serial mpi)
+
+ install_executable(gjoin)
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/grope/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/grope/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/grope/CMakeLists.txt 2012-01-09 18:04:58.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/grope/CMakeLists.txt 2012-02-06 13:39:20.259158744 +0100
+@@ -17,8 +17,8 @@
+ ckeb1.f cknps.f getprc.f limits.f prebn.f prfrm.f prmmax.f prnsv.f prtims.f rdeb1.f rdmmax.f rdnps.f rixid.f selmap.f wdberr.f
+ ckelb.f comand.f numstr.f prelb.f prglob.f prname.f prqa.f prvers.f rdelb.f rdnam1.f rdqa.f rixint.f selset.f)
+
+-PACKAGE_ADD_LIBRARY(grope_app_lib SOURCES ${SOURCES} DEPLIBS supes suplib exodus_for)
+-PACKAGE_ADD_EXECUTABLE(grope NOEXEPREFIX NOEXESUFFIX LINKER_LANGUAGE Fortran SOURCES grope.f DEPLIBS grope_app_lib COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_grope_app_lib SOURCES ${SOURCES} DEPLIBS trilinos_supes trilinos_suplib trilinos_exodus_for)
++PACKAGE_ADD_EXECUTABLE(grope NOEXEPREFIX NOEXESUFFIX LINKER_LANGUAGE Fortran SOURCES grope.f DEPLIBS trilinos_grope_app_lib COMM serial mpi)
+
+ install_executable(grope)
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/mapvar/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/mapvar/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/mapvar/CMakeLists.txt 2012-01-09 18:04:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/mapvar/CMakeLists.txt 2012-02-06 13:31:43.463174900 +0100
+@@ -18,8 +18,8 @@
+ bldsrf.f elton0.f exts.f indexx.f intrpe.f node.f rda2.f seton1.f srchge.f srcht.f version.f
+ bs.f elton1.f flgrad.f inielt.f intrpn.f mke.f opnfil.f rdb1.f shapef.f srchgt.f stran.f vol.f)
+
+-PACKAGE_ADD_LIBRARY(mapvar_app_lib SOURCES ${SOURCES} DEPLIBS supes suplib exodus_for)
+-PACKAGE_ADD_EXECUTABLE(mapvar NOEXEPREFIX NOEXESUFFIX LINKER_LANGUAGE Fortran SOURCES mapvar.f DEPLIBS mapvar_app_lib COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_mapvar_app_lib SOURCES ${SOURCES} DEPLIBS trilinos_supes trilinos_suplib trilinos_exodus_for)
++PACKAGE_ADD_EXECUTABLE(mapvar NOEXEPREFIX NOEXESUFFIX LINKER_LANGUAGE Fortran SOURCES mapvar.f DEPLIBS trilinos_mapvar_app_lib COMM serial mpi)
+ install_executable(mapvar)
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/mapvar-kd/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/mapvar-kd/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/mapvar-kd/CMakeLists.txt 2012-01-09 18:04:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/mapvar-kd/CMakeLists.txt 2012-02-06 13:38:36.247160299 +0100
+@@ -21,8 +21,8 @@
+ bldpte.f debg.blk exth.f ininod.f lenstr.f opnfil.f rdinpt.f sintpn.f tetsrc.f wrtc.f
+ bldptn.f debug.f extq.f initlz.f optkd.c rundat.blk srchh.f toldat.blk)
+
+-PACKAGE_ADD_LIBRARY(mapvar-kd_app_lib SOURCES ${SOURCES} DEPLIBS supes suplib exodus_for)
+-PACKAGE_ADD_EXECUTABLE(mapvar-kd NOEXEPREFIX NOEXESUFFIX LINKER_LANGUAGE Fortran SOURCES mapvar-kd.f DEPLIBS mapvar-kd_app_lib COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_mapvar-kd_app_lib SOURCES ${SOURCES} DEPLIBS trilinos_supes trilinos_suplib trilinos_exodus_for)
++PACKAGE_ADD_EXECUTABLE(mapvar-kd NOEXEPREFIX NOEXESUFFIX LINKER_LANGUAGE Fortran SOURCES mapvar-kd.f DEPLIBS trilinos_mapvar-kd_app_lib COMM serial mpi)
+ install_executable(mapvar-kd)
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/mat2exo/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/mat2exo/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/mat2exo/CMakeLists.txt 2012-01-09 18:04:58.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/mat2exo/CMakeLists.txt 2012-02-06 13:34:08.519169768 +0100
+@@ -18,8 +18,8 @@
+ SET(HEADERS "")
+ SET(SOURCES add_to_log.c)
+
+-PACKAGE_ADD_LIBRARY(${CODE}_app_lib SOURCES ${SOURCES} DEPLIBS exodus ${DEPMATLIB})
+-PACKAGE_ADD_EXECUTABLE(${CODE} NOEXEPREFIX NOEXESUFFIX SOURCES mat2exo.c DEPLIBS ${CODE}_app_lib ${DEPMATLIB} COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_${CODE}_app_lib SOURCES ${SOURCES} DEPLIBS trilinos_exodus ${DEPMATLIB})
++PACKAGE_ADD_EXECUTABLE(${CODE} NOEXEPREFIX NOEXESUFFIX SOURCES mat2exo.c DEPLIBS trilinos_${CODE}_app_lib ${DEPMATLIB} COMM serial mpi)
+ install_executable(${CODE})
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/nem_slice/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/nem_slice/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/nem_slice/CMakeLists.txt 2012-01-09 18:04:55.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/nem_slice/CMakeLists.txt 2012-02-06 13:35:03.591167819 +0100
+@@ -9,7 +9,7 @@
+
+ IF (${PACKAGE_NAME}_ENABLE_Zoltan)
+ INCLUDE_DIRECTORIES(${Zoltan_INCLUDE_DIRS})
+- SET(ZOLTAN_DEP zoltan)
++ SET(ZOLTAN_DEP trilinos_zoltan)
+ ADD_DEFINITIONS(-DUSE_ZOLTAN)
+ ENDIF()
+
+@@ -23,8 +23,8 @@
+
+ CHECK_INCLUDE_FILE( sys/resource.h HAS_GETRUSAGE )
+
+-PACKAGE_ADD_LIBRARY(nem_slice_app_lib SOURCES ${SOURCES} DEPLIBS ${ZOLTAN_DEP} exodus nemesis chaco)
+-PACKAGE_ADD_EXECUTABLE(nem_slice NOEXEPREFIX NOEXESUFFIX SOURCES elb_main.c DEPLIBS ${ZOLTAN_DEP} nem_slice_app_lib COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_nem_slice_app_lib SOURCES ${SOURCES} DEPLIBS ${ZOLTAN_DEP} trilinos_exodus trilinos_nemesis trilinos_chaco)
++PACKAGE_ADD_EXECUTABLE(nem_slice NOEXEPREFIX NOEXESUFFIX SOURCES elb_main.c DEPLIBS ${ZOLTAN_DEP} trilinos_nem_slice_app_lib COMM serial mpi)
+ install_executable(nem_slice)
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/nem_spread/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/nem_spread/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/nem_spread/CMakeLists.txt 2012-01-09 18:04:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/nem_spread/CMakeLists.txt 2012-02-06 13:38:51.335159765 +0100
+@@ -20,8 +20,8 @@
+ sort_utils.c add_to_log.c
+ md_timer_getrusage.c md_wrap_generic_c.c)
+
+-PACKAGE_ADD_LIBRARY(nem_spread_app_lib SOURCES ${SOURCES} DEPLIBS exodus nemesis)
+-PACKAGE_ADD_EXECUTABLE(nem_spread NOEXEPREFIX NOEXESUFFIX SOURCES pe_exoII_2par_exoII.c DEPLIBS nem_spread_app_lib COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_nem_spread_app_lib SOURCES ${SOURCES} DEPLIBS trilinos_exodus trilinos_nemesis)
++PACKAGE_ADD_EXECUTABLE(nem_spread NOEXEPREFIX NOEXESUFFIX SOURCES pe_exoII_2par_exoII.c DEPLIBS trilinos_nem_spread_app_lib COMM serial mpi)
+ install_executable(nem_spread)
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/applications/txtexo/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/applications/txtexo/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/applications/txtexo/CMakeLists.txt 2012-01-09 18:04:56.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/applications/txtexo/CMakeLists.txt 2012-02-06 13:37:25.847162788 +0100
+@@ -15,8 +15,8 @@
+ dboelb.f rdelb.f rdinit.f rdnm1.f rdxyz.f rwpval.f rwqa.f
+ rdeb1.f rdess.f rdmap.f rdnps.f rwname.f rwpval1.f rwstep.f)
+
+-PACKAGE_ADD_LIBRARY(txtexo_app_lib SOURCES ${SOURCES} DEPLIBS supes suplib exodus_for exodus)
+-PACKAGE_ADD_EXECUTABLE(txtexo NOEXEPREFIX NOEXESUFFIX LINKER_LANGUAGE Fortran SOURCES txtexo.f DEPLIBS txtexo_app_lib COMM serial mpi)
++PACKAGE_ADD_LIBRARY(trilinos_txtexo_app_lib SOURCES ${SOURCES} DEPLIBS trilinos_supes trilinos_suplib trilinos_exodus_for trilinos_exodus)
++PACKAGE_ADD_EXECUTABLE(txtexo NOEXEPREFIX NOEXESUFFIX LINKER_LANGUAGE Fortran SOURCES txtexo.f DEPLIBS trilinos_txtexo_app_lib COMM serial mpi)
+ install_executable(txtexo)
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/aprepro_lib/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/aprepro_lib/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/aprepro_lib/CMakeLists.txt 2012-01-09 18:05:08.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/aprepro_lib/CMakeLists.txt 2012-02-06 13:47:29.251141446 +0100
+@@ -24,7 +24,7 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- aprepro_lib
++ trilinos_aprepro_lib
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/chaco/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/chaco/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/chaco/CMakeLists.txt 2012-01-09 18:05:02.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/chaco/CMakeLists.txt 2012-02-06 14:15:25.223082166 +0100
+@@ -56,7 +56,7 @@
+
+ get_property(SOURCES GLOBAL PROPERTY chaco_SRCS)
+ PACKAGE_ADD_LIBRARY(
+- chaco
++ trilinos_chaco
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/exodus/cbind/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/exodus/cbind/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/exodus/cbind/CMakeLists.txt 2012-01-09 18:05:07.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/exodus/cbind/CMakeLists.txt 2012-02-06 14:15:39.431081664 +0100
+@@ -22,7 +22,7 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- exodus
++ trilinos_exodus
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/exodus/cbind/test/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/exodus/cbind/test/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/exodus/cbind/test/CMakeLists.txt 2012-01-09 18:05:07.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/exodus/cbind/test/CMakeLists.txt 2012-02-06 15:10:10.334965972 +0100
+@@ -109,7 +109,7 @@
+ # when built with shareable libraries on some platforms....
+
+ FOREACH ( testName ${cbind_OLDTESTS} )
+- PACKAGE_ADD_EXECUTABLE( ${testName} NOEXEPREFIX SOURCES ${testName}.c LINKER_LANGUAGE CXX DEPLIBS exodus)
++ PACKAGE_ADD_EXECUTABLE( ${testName} NOEXEPREFIX SOURCES ${testName}.c LINKER_LANGUAGE CXX DEPLIBS trilinos_exodus)
+ ENDFOREACH ( testName )
+
+ PACKAGE_ADD_ADVANCED_TEST(
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/exodus_for/forbind/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/exodus_for/forbind/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/exodus_for/forbind/CMakeLists.txt 2012-01-09 18:05:03.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/exodus_for/forbind/CMakeLists.txt 2012-02-06 14:15:34.007081856 +0100
+@@ -17,10 +17,10 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- exodus_for
++ trilinos_exodus_for
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS exodus
++ DEPLIBS trilinos_exodus
+ )
+
+ PACKAGE_ADD_TEST_DIRECTORIES(test)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/CMakeLists.txt 2012-01-09 18:05:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/CMakeLists.txt 2012-02-06 13:46:06.691144366 +0100
+@@ -21,7 +21,7 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- Ioss
++ trilinos_Ioss
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ DEPLIBS ${DEPLIBS}
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/exodusII/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/exodusII/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/exodusII/CMakeLists.txt 2012-01-09 18:04:58.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/exodusII/CMakeLists.txt 2012-02-06 13:47:02.883142378 +0100
+@@ -13,10 +13,10 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- Ioex
++ trilinos_Ioex
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS Ioss exodus nemesis
++ DEPLIBS trilinos_Ioss trilinos_exodus trilinos_nemesis
+ )
+
+ IF (BUILD_TESTING)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/generated/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/generated/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/generated/CMakeLists.txt 2012-01-09 18:04:58.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/generated/CMakeLists.txt 2012-02-06 13:46:40.051143186 +0100
+@@ -14,10 +14,10 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- Iogn
++ trilinos_Iogn
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS Ioss
++ DEPLIBS trilinos_Ioss
+ )
+
+ IF (BUILD_TESTING)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt 2012-01-09 18:05:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/heartbeat/CMakeLists.txt 2012-02-06 13:46:32.927143438 +0100
+@@ -14,10 +14,10 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- Iohb
++ trilinos_Iohb
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS Ioss
++ DEPLIBS trilinos_Ioss
+ )
+
+ IF (BUILD_TESTING)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/init/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/init/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/init/CMakeLists.txt 2012-01-09 18:04:58.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/init/CMakeLists.txt 2012-02-06 13:44:09.491148512 +0100
+@@ -14,29 +14,29 @@
+ )
+
+ IF (${PACKAGE_NAME}_ENABLE_Pamgen)
+-SET(PAMGENLIB Iopg)
++SET(PAMGENLIB trilinos_Iopg)
+ ELSE()
+ ADD_DEFINITIONS(-DNO_PAMGEN_SUPPORT)
+ ENDIF()
+
+ IF (${PACKAGE_NAME}_ENABLE_SEACASExodus)
+-SET(EXODUSLIB Ioex)
++SET(EXODUSLIB trilinos_Ioex)
+ ELSE()
+ ADD_DEFINITIONS(-DNO_EXODUS_SUPPORT)
+ ENDIF()
+
+ IF (${PACKAGE_NAME}_ENABLE_ParaviewImesh)
+-SET(VISLIB Iovs)
++SET(VISLIB trilinos_Iovs)
+ ELSE()
+ ADD_DEFINITIONS(-DNO_PARAVIEWIMESH_SUPPORT)
+ ENDIF()
+
+
+ PACKAGE_ADD_LIBRARY(
+- Ionit
++ trilinos_Ionit
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS Ioss ${EXODUSLIB} Iogn Iohb Iotr ${PAMGENLIB} ${VISLIB}
++ DEPLIBS trilinos_Ioss ${EXODUSLIB} trilinos_Iogn trilinos_Iohb trilinos_Iotr ${PAMGENLIB} ${VISLIB}
+ )
+
+ IF (BUILD_TESTING)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/main/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/main/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/main/CMakeLists.txt 2012-01-09 18:04:59.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/main/CMakeLists.txt 2012-02-06 15:08:59.794968467 +0100
+@@ -21,8 +21,8 @@
+
+ SET(CMAKE_EXECUTABLE_SUFFIX "")
+
+-PACKAGE_ADD_EXECUTABLE(io_shell NOEXEPREFIX NOEXESUFFIX SOURCES io_shell.C DEPLIBS Ionit)
+-PACKAGE_ADD_EXECUTABLE(io_info NOEXEPREFIX NOEXESUFFIX SOURCES io_info.C volume.C DEPLIBS Ionit)
++PACKAGE_ADD_EXECUTABLE(io_shell NOEXEPREFIX NOEXESUFFIX SOURCES io_shell.C DEPLIBS trilinos_Ionit)
++PACKAGE_ADD_EXECUTABLE(io_info NOEXEPREFIX NOEXESUFFIX SOURCES io_info.C volume.C DEPLIBS trilinos_Ionit)
+
+ install_executable(io_shell)
+ install_executable(io_info)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt 2012-01-09 18:05:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/pamgen/CMakeLists.txt 2012-02-06 13:46:49.267142860 +0100
+@@ -13,10 +13,10 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- Iopg
++ trilinos_Iopg
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS Ioss pamgen
++ DEPLIBS trilinos_Ioss trilinos_pamgen
+ )
+
+ IF (BUILD_TESTING)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/transform/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/transform/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/transform/CMakeLists.txt 2012-01-09 18:05:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/transform/CMakeLists.txt 2012-02-06 13:41:00.179155206 +0100
+@@ -14,10 +14,10 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- Iotr
++ trilinos_Iotr
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS Ioss
++ DEPLIBS trilinos_Ioss
+ )
+
+ IF (BUILD_TESTING)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/utest/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/utest/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/utest/CMakeLists.txt 2012-01-09 18:04:58.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/utest/CMakeLists.txt 2012-02-06 15:08:42.190969089 +0100
+@@ -3,7 +3,7 @@
+ PACKAGE_ADD_EXECUTABLE(
+ Utst_ioel
+ SOURCES Utst_ioel.C
+- DEPLIBS Ionit
++ DEPLIBS trilinos_Ionit
+ )
+
+ PACKAGE_ADD_TEST(
+@@ -16,7 +16,7 @@
+ PACKAGE_ADD_EXECUTABLE(
+ Utst_superelement
+ SOURCES Utst_superelement.C
+- DEPLIBS Ionit
++ DEPLIBS trilinos_Ionit
+ )
+
+ PACKAGE_ADD_TEST(
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt 2012-01-09 18:04:59.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/visualization/CMakeLists.txt 2012-02-06 13:43:31.075149871 +0100
+@@ -13,10 +13,10 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- Iovs
++ trilinos_Iovs
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS Ioss paraview_imesh
++ DEPLIBS trilinos_Ioss trilinos_paraview_imesh
+ )
+
+ IF (BUILD_TESTING)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/xdmf/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/xdmf/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/ioss/src/xdmf/CMakeLists.txt 2012-01-09 18:04:59.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/ioss/src/xdmf/CMakeLists.txt 2012-02-06 15:09:41.390966996 +0100
+@@ -13,10 +13,10 @@
+ "${CMAKE_CURRENT_BINARY_DIR}/../"
+ )
+
+-SET(DEPLIBS Ioss)
++SET(DEPLIBS trilinos_Ioss)
+
+ PACKAGE_ADD_LIBRARY(
+- Ioxf
++ trilinos_Ioxf
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ DEPLIBS ${DEPLIBS}
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/nemesis/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/nemesis/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/nemesis/CMakeLists.txt 2012-01-09 18:05:03.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/nemesis/CMakeLists.txt 2012-02-06 13:40:50.211155560 +0100
+@@ -75,10 +75,10 @@
+ )
+
+ PACKAGE_ADD_LIBRARY(
+- nemesis
++ trilinos_nemesis
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS exodus
++ DEPLIBS trilinos_exodus
+ )
+
+ PACKAGE_ADD_TEST(
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/supes/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/supes/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/supes/CMakeLists.txt 2012-01-09 18:05:05.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/supes/CMakeLists.txt 2012-02-06 13:40:05.863157129 +0100
+@@ -28,7 +28,7 @@
+ mem_mgr/mxeror.f mem_mgr/mxlist.f mem_mgr/mxrsrv.f mem_mgr/mylong.f mem_mgr/vtable.f)
+
+ PACKAGE_ADD_LIBRARY(
+- supes
++ trilinos_supes
+ SOURCES ${SOURCES}
+ )
+
+@@ -36,8 +36,8 @@
+ ADD_EXECUTABLE(ffrtest ffrtest.f)
+ ADD_EXECUTABLE(memtest memtest.f)
+
+-TARGET_LINK_LIBRARIES(exttest supes)
+-TARGET_LINK_LIBRARIES(ffrtest supes)
+-TARGET_LINK_LIBRARIES(memtest supes)
++TARGET_LINK_LIBRARIES(exttest trilinos_supes)
++TARGET_LINK_LIBRARIES(ffrtest trilinos_supes)
++TARGET_LINK_LIBRARIES(memtest trilinos_supes)
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/suplib/CMakeLists.txt trilinos-10.8.5.dfsg/packages/seacas/libraries/suplib/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/seacas/libraries/suplib/CMakeLists.txt 2012-01-09 18:05:08.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/seacas/libraries/suplib/CMakeLists.txt 2012-02-06 13:47:11.651142069 +0100
+@@ -36,9 +36,9 @@
+ cpyrea.f dboeb1.f engstr.f ffvrng.f lenstr.f pckstr.f)
+
+ PACKAGE_ADD_LIBRARY(
+- suplib
++ trilinos_suplib
+ SOURCES ${SOURCES}
+- DEPLIBS supes
++ DEPLIBS trilinos_supes
+ )
+
+ SUBPACKAGE_POSTPROCESS()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/shards/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/shards/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/shards/src/CMakeLists.txt 2012-01-09 18:05:23.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/shards/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -51,7 +51,7 @@
#
@@ -2572,10 +8222,140 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/shards/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/shards/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/shards/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/shards/src/CMakeLists.txt.orig 2012-02-06 12:48:02.127267616 +0100
+@@ -0,0 +1,57 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
++ )
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++# CORE
++APPEND_SET(HEADERS
++ Shards_CellTopologyData.h
++ Shards_Array.hpp
++ Shards_ArrayVector.hpp
++ Shards_CellTopology.hpp
++ Shards_CellTopologyManagedData.hpp
++ Shards_CellTopologyTraits.hpp
++ Shards_BasicTopologies.hpp
++ Shards_IndexList.hpp
++ Shards_SimpleArrayOps.hpp
++ Shards_CellTopology.hpp
++ Shards_TypeList.hpp
++ )
++
++# CORE
++APPEND_SET(SOURCES
++ Shards_Array.cpp
++ Shards_CellTopologyData.c
++ Shards_CellTopology.cpp
++ Shards_CellTopologyManagedData.cpp
++ Shards_BasicTopologies.cpp
++ )
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ shards
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_adapt/stk_adapt/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_adapt/stk_adapt/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_adapt/stk_adapt/CMakeLists.txt 2012-01-09 18:04:34.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_adapt/stk_adapt/CMakeLists.txt 2012-02-06 14:21:17.395069709 +0100
+@@ -38,7 +38,7 @@
+ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
+
+ PACKAGE_ADD_LIBRARY(
+- stk_adapt
++ trilinos_stk_adapt
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_algsup/stk_algsup/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_algsup/stk_algsup/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_algsup/stk_algsup/CMakeLists.txt 2012-01-09 18:04:28.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_algsup/stk_algsup/CMakeLists.txt 2012-02-06 14:22:51.811066371 +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}
+ )
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt 2012-01-09 18:04:34.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_expreval/stk_expreval/CMakeLists.txt 2012-02-06 14:23:22.371065289 +0100
+@@ -41,7 +41,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_expreval
++ trilinos_stk_expreval
+ NOINSTALLHEADERS ${HEADERS} ${HEADERS_IMPL}
+ SOURCES ${SOURCES} ${SOURCES_IMPL}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_io/stk_io/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_io/stk_io/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_io/stk_io/CMakeLists.txt 2012-01-09 18:04:37.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_io/stk_io/CMakeLists.txt 2012-02-06 14:23:00.547066061 +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}
+ )
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_io/stk_io/util/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_io/stk_io/util/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_io/stk_io/util/CMakeLists.txt 2012-01-09 18:04:37.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_io/stk_io/util/CMakeLists.txt 2012-02-06 14:23:09.187065757 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt 2012-01-09 18:04:28.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_linsys/stk_linsys/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -39,7 +39,7 @@
#
@@ -2585,10 +8365,9 @@
NOINSTALLHEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2012-01-09 18:04:26.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt 2012-02-06 14:22:40.355066774 +0100
@@ -48,10 +48,10 @@
#
@@ -2602,10 +8381,74 @@
)
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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_mesh/stk_mesh/base/CMakeLists.txt.orig 2012-02-06 12:48:02.027267620 +0100
+@@ -0,0 +1,61 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++# PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++SET(HEADERS_IMPL "")
++SET(SOURCES_IMPL "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../baseImpl/)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../)
++# INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
++# INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../../stk_util)
++# INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS}/..)
++
++#
++# Core headers
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++FILE(GLOB HEADERS *.hpp)
++FILE(GLOB SOURCES *.cpp)
++
++FILE(GLOB HEADERS_IMPL ${CMAKE_CURRENT_SOURCE_DIR}/../baseImpl/*.hpp)
++FILE(GLOB SOURCES_IMPL ${CMAKE_CURRENT_SOURCE_DIR}/../baseImpl/*.cpp)
++
++IF (TPL_ENABLE_MPI)
++ENDIF()
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ stk_mesh_base
++ NOINSTALLHEADERS ${HEADERS} ${HEADERS_IMPL}
++ SOURCES ${SOURCES} ${SOURCES_IMPL}
++ DEPLIBS stk_util_env stk_util_parallel
++ )
++
++INSTALL(FILES ${HEADERS} DESTINATION
++ ${CMAKE_INSTALL_PREFIX}/include/stk_mesh/base/)
++
++INSTALL(FILES ${HEADERS_IMPL} DESTINATION
++ ${CMAKE_INSTALL_PREFIX}/include/stk_mesh/baseImpl/)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt 2012-01-09 18:04:27.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt 2012-02-06 14:22:32.115067067 +0100
@@ -42,9 +42,9 @@
#
@@ -2618,10 +8461,150 @@
SOURCES ${SOURCES} ${SOURCES_IMPL}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_mesh/stk_mesh/fem/CMakeLists.txt.orig 2012-02-06 12:48:02.027267620 +0100
+@@ -0,0 +1,53 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++# PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++SET(HEADERS_IMPL "")
++SET(SOURCES_IMPL "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../baseImpl/)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../)
++
++#
++# Core headers
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++FILE(GLOB HEADERS *.hpp)
++FILE(GLOB SOURCES *.cpp)
++
++IF (TPL_ENABLE_MPI)
++ENDIF()
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ stk_mesh_fem
++ NOINSTALLHEADERS ${HEADERS} ${HEADERS_IMPL}
++ DEPLIBS stk_mesh_base
++ SOURCES ${SOURCES} ${SOURCES_IMPL}
++ )
++
++INSTALL(FILES ${HEADERS} DESTINATION
++ ${CMAKE_INSTALL_PREFIX}/include/stk_mesh/fem/)
++
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt 2012-01-09 18:04:26.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_mesh/stk_mesh/fixtures/CMakeLists.txt 2012-02-06 14:22:25.875067289 +0100
+@@ -48,7 +48,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_mesh_fixtures
++ trilinos_stk_mesh_fixtures
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_mesh/unit_tests/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_mesh/unit_tests/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_mesh/unit_tests/CMakeLists.txt 2012-01-09 18:04:27.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_mesh/unit_tests/CMakeLists.txt 2012-02-06 15:21:51.258941179 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_mesh/use_cases/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_mesh/use_cases/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_mesh/use_cases/CMakeLists.txt 2012-01-09 18:04:27.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_mesh/use_cases/CMakeLists.txt 2012-02-06 15:21:40.266941569 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_percept/stk_percept/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_percept/stk_percept/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_percept/stk_percept/CMakeLists.txt 2012-01-09 18:04:32.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_percept/stk_percept/CMakeLists.txt 2012-02-06 14:22:20.803067467 +0100
+@@ -54,7 +54,7 @@
+ SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR}/..)
+
+ PACKAGE_ADD_LIBRARY(
+- stk_percept
++ trilinos_stk_percept
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_rebalance/stk_rebalance/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_rebalance/stk_rebalance/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_rebalance/stk_rebalance/CMakeLists.txt 2012-01-09 18:04:37.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_rebalance/stk_rebalance/CMakeLists.txt 2012-02-06 14:20:47.027070785 +0100
+@@ -40,7 +40,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_rebalance
++ trilinos_stk_rebalance
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_rebalance/stk_rebalance_utils/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_rebalance/stk_rebalance_utils/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_rebalance/stk_rebalance_utils/CMakeLists.txt 2012-01-09 18:04:37.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_rebalance/stk_rebalance_utils/CMakeLists.txt 2012-02-06 14:20:55.155070496 +0100
+@@ -12,7 +12,7 @@
+ FILE(GLOB HEADERS *.cpp)
+
+ PACKAGE_ADD_LIBRARY(
+- stk_rebalance_utils
++ trilinos_stk_rebalance_utils
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_rebalance/use_cases/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_rebalance/use_cases/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_rebalance/use_cases/CMakeLists.txt 2012-01-09 18:04:37.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_rebalance/use_cases/CMakeLists.txt 2012-02-06 15:20:35.402943862 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_search/stk_search/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_search/stk_search/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_search/stk_search/CMakeLists.txt 2012-01-09 18:04:34.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_search/stk_search/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -54,7 +54,7 @@
#
@@ -2631,10 +8614,69 @@
NOINSTALLHEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt 2012-01-09 18:04:34.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_search_util/stk_search_util/stk_mesh/CMakeLists.txt 2012-02-06 14:21:26.771069379 +0100
+@@ -48,7 +48,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- stk_search_util
++ trilinos_stk_search_util
+ NOINSTALLHEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_usecases/app/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_usecases/app/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_usecases/app/CMakeLists.txt 2012-01-09 18:04:38.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_usecases/app/CMakeLists.txt 2012-02-06 15:20:44.058943556 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_usecases/io/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_usecases/io/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_usecases/io/CMakeLists.txt 2012-01-09 18:04:38.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_usecases/io/CMakeLists.txt 2012-02-06 15:20:48.170943413 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_usecases/linsys/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_usecases/linsys/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_usecases/linsys/CMakeLists.txt 2012-01-09 18:04:38.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_usecases/linsys/CMakeLists.txt 2012-02-06 15:20:52.634943253 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_usecases/transfer/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_usecases/transfer/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_usecases/transfer/CMakeLists.txt 2012-01-09 18:04:37.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_usecases/transfer/CMakeLists.txt 2012-02-06 15:21:00.058942989 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_util/stk_util/diag/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2012-01-09 18:04:35.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_util/stk_util/diag/CMakeLists.txt 2012-02-06 15:21:24.650942120 +0100
@@ -59,8 +59,8 @@
#
@@ -2646,10 +8688,9 @@
NOINSTALLHEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_util/stk_util/environment/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2012-01-09 18:04:35.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_util/stk_util/environment/CMakeLists.txt 2012-02-06 15:21:16.458942409 +0100
@@ -70,8 +70,8 @@
#
@@ -2661,10 +8702,9 @@
NOINSTALLHEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2012-01-09 18:04:35.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt 2012-02-06 14:22:12.755067752 +0100
@@ -55,9 +55,9 @@
#
@@ -2677,10 +8717,93 @@
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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_util/stk_util/parallel/CMakeLists.txt.orig 2012-02-06 12:48:02.039267619 +0100
+@@ -0,0 +1,65 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++# PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../)
++
++#
++# Core headers
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++APPEND_SET(HEADERS
++BroadcastArg.hpp
++DistributedIndex.hpp
++ParallelComm.hpp
++Parallel.hpp
++ParallelIndex.hpp
++ParallelInputStream.hpp
++ParallelReduce.hpp
++ )
++
++APPEND_SET(SOURCES
++BroadcastArg.cpp
++DistributedIndex.cpp
++ParallelComm.cpp
++Parallel.cpp
++ParallelIndex.cpp
++ParallelInputStream.cpp
++ParallelReduce.cpp
++ )
++
++IF (TPL_ENABLE_MPI)
++ENDIF()
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ stk_util_parallel
++ NOINSTALLHEADERS ${HEADERS}
++ DEPLIBS stk_util_env
++ SOURCES ${SOURCES}
++ )
++
++INSTALL(FILES ${HEADERS} DESTINATION
++ ${CMAKE_INSTALL_PREFIX}/include/stk_util/parallel/)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt 2012-01-09 18:04:35.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_util/stk_util/unit_test_support/CMakeLists.txt 2012-02-06 14:21:36.115069046 +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}
+ )
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt 2012-01-09 18:04:35.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_util/stk_util/use_cases/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -43,7 +43,7 @@
#
@@ -2690,10 +8813,9 @@
NOINSTALLHEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_util/stk_util/util/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2012-01-09 18:04:36.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_util/stk_util/util/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -41,7 +41,7 @@
#
@@ -2703,10 +8825,221 @@
NOINSTALLHEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/unit_tests/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stk/stk_util/unit_tests/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stk/stk_util/unit_tests/CMakeLists.txt 2012-01-09 18:04:37.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stk/stk_util/unit_tests/CMakeLists.txt 2012-02-06 15:21:33.226941818 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stokhos/example/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stokhos/example/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stokhos/example/CMakeLists.txt 2012-01-09 18:05:12.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stokhos/example/CMakeLists.txt 2012-02-06 15:51:31.822878201 +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
++ trilinos_linear2d_diffusion
+ HEADERS twoD_diffusion_ME.hpp
+ SOURCES twoD_diffusion_ME.cpp
+ TESTONLY
+- DEPLIBS stokhos
++ DEPLIBS trilinos_stokhos
+ )
+
+ IF(Stokhos_ENABLE_TriKota)
+@@ -86,7 +86,7 @@
+ 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)
+@@ -95,7 +95,7 @@
+ Linear2D_Diffusion_Collocation_Example
+ SOURCES linear2d_diffusion_collocation.cpp
+ COMM serial mpi
+- DEPLIBS stokhos linear2d_diffusion
++ DEPLIBS trilinos_stokhos trilinos_linear2d_diffusion
+ )
+
+ IF(Stokhos_ENABLE_Stratimikos)
+@@ -104,7 +104,7 @@
+ Linear2D_Diffusion_Collocation_Strat_Example
+ SOURCES linear2d_diffusion_collocation_strat.cpp
+ COMM serial mpi
+- DEPLIBS stokhos linear2d_diffusion
++ DEPLIBS trilinos_stokhos trilinos_linear2d_diffusion
+ )
+
+ IF(Stokhos_ENABLE_NOX)
+@@ -113,7 +113,7 @@
+ Linear2D_Diffusion_PCE_MPNI_Example
+ SOURCES linear2d_diffusion_pce_mpni.cpp
+ COMM serial mpi
+- DEPLIBS stokhos linear2d_diffusion
++ DEPLIBS trilinos_stokhos trilinos_linear2d_diffusion
+ ARGS 1
+ NUM_MPI_PROCS 2
+ PASS_REGULAR_EXPRESSION "Example Passed!"
+@@ -131,7 +131,7 @@
+ Linear2D_Diffusion_PCE_Example
+ SOURCES linear2d_diffusion_pce.cpp
+ COMM serial mpi
+- DEPLIBS stokhos linear2d_diffusion
++ DEPLIBS trilinos_stokhos trilinos_linear2d_diffusion
+ ARGS 1
+ NUM_MPI_PROCS 2
+ PASS_REGULAR_EXPRESSION "Example Passed!"
+@@ -143,7 +143,7 @@
+ Linear2D_Diffusion_PCE_NOX_Example
+ SOURCES linear2d_diffusion_pce_nox.cpp
+ COMM serial mpi
+- DEPLIBS stokhos linear2d_diffusion
++ DEPLIBS trilinos_stokhos trilinos_linear2d_diffusion
+ ARGS 1
+ NUM_MPI_PROCS 2
+ PASS_REGULAR_EXPRESSION "Example Passed!"
+@@ -154,7 +154,7 @@
+ Linear2D_Diffusion_PCE_NOX_SG_Solvers
+ SOURCES linear2d_diffusion_pce_nox_sg_solvers.cpp
+ COMM serial mpi
+- DEPLIBS stokhos linear2d_diffusion
++ DEPLIBS trilinos_stokhos trilinos_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()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stokhos/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stokhos/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stokhos/src/CMakeLists.txt 2012-01-09 18:05:13.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stokhos/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -283,7 +283,7 @@
#
@@ -2716,10 +9049,302 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stokhos/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/stokhos/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/stokhos/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stokhos/src/CMakeLists.txt.orig 2012-02-06 12:48:01.667267632 +0100
+@@ -0,0 +1,289 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++SET(HAVE_STOKHOS_DAKOTA ${${PACKAGE_NAME}_ENABLE_TriKota})
++
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++# Add path to Dakota headers in installed directory
++IF (${PACKAGE_NAME}_ENABLE_TriKota)
++INCLUDE_DIRECTORIES(
++ ${CMAKE_CURRENT_BINARY_DIR}/../../TriKota/Dakota/install/include
++ )
++ENDIF()
++
++
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
++ )
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++SET(HEADERS ${HEADERS}
++ Stokhos.hpp
++ Stokhos_ConfigDefs.h
++ Stokhos_Version.hpp
++ Stokhos_gaussq.h
++ Stokhos_DynamicArrayTraits.hpp
++ Stokhos_OneDOrthogPolyBasis.hpp
++ Stokhos_RecurrenceBasis.hpp
++ Stokhos_RecurrenceBasisImp.hpp
++ Stokhos_HermiteBasis.hpp
++ Stokhos_HermiteBasisImp.hpp
++ Stokhos_JacobiBasis.hpp
++ Stokhos_JacobiBasisImp.hpp
++ Stokhos_DiscretizedStieltjesBasis.hpp
++ Stokhos_DiscretizedStieltjesBasisImp.hpp
++ Stokhos_RysBasis.hpp
++ Stokhos_LegendreBasis.hpp
++ Stokhos_LegendreBasisImp.hpp
++ Stokhos_ClenshawCurtisLegendreBasis.hpp
++ Stokhos_ClenshawCurtisLegendreBasisImp.hpp
++ Stokhos_StieltjesPCEBasis.hpp
++ Stokhos_StieltjesPCEBasisImp.hpp
++ Stokhos_StieltjesBasis.hpp
++ Stokhos_StieltjesBasisImp.hpp
++ Stokhos_PecosOneDOrthogPolyBasis.hpp
++ Stokhos_PecosOneDOrthogPolyBasisImp.hpp
++ Stokhos_OrthogPolyBasis.hpp
++ Stokhos_ProductBasis.hpp
++ Stokhos_DerivBasis.hpp
++ Stokhos_CompletePolynomialBasis.hpp
++ Stokhos_CompletePolynomialBasisImp.hpp
++ Stokhos_GramSchmidtBasis.hpp
++ Stokhos_GramSchmidtBasisImp.hpp
++ Stokhos_BasisFactory.hpp
++ Stokhos_BasisFactoryImp.hpp
++ Stokhos_SparseArray.hpp
++ Stokhos_Sparse3Tensor.hpp
++ Stokhos_Sparse3TensorImp.hpp
++ Stokhos_Dense3Tensor.hpp
++ Stokhos_Dense3TensorImp.hpp
++ Stokhos_Sparse3TensorUtilities.hpp
++ Stokhos_Quadrature.hpp
++ Stokhos_TensorProductQuadrature.hpp
++ Stokhos_TensorProductQuadratureImp.hpp
++ Stokhos_SparseGridQuadrature.hpp
++ Stokhos_SparseGridQuadratureImp.hpp
++ Stokhos_AnisoSparseGridQuadrature.hpp
++ Stokhos_AnisoSparseGridQuadratureImp.hpp
++ Stokhos_UserDefinedQuadrature.hpp
++ Stokhos_UserDefinedQuadratureImp.hpp
++ Stokhos_QuadratureFactory.hpp
++ Stokhos_QuadratureFactoryImp.hpp
++ Stokhos_StandardStorage.hpp
++ Stokhos_OrthogPolyApprox.hpp
++ Stokhos_OrthogPolyApproxImp.hpp
++ Stokhos_OrthogPolyExpansion.hpp
++ Stokhos_OrthogPolyExpansionBase.hpp
++ Stokhos_OrthogPolyExpansionBaseImp.hpp
++ Stokhos_ConstantOrthogPolyExpansion.hpp
++ Stokhos_ConstantOrthogPolyExpansionImp.hpp
++ Stokhos_AlgebraicOrthogPolyExpansion.hpp
++ Stokhos_AlgebraicOrthogPolyExpansionImp.hpp
++ Stokhos_QuadOrthogPolyExpansion.hpp
++ Stokhos_QuadOrthogPolyExpansionImp.hpp
++ Stokhos_DerivOrthogPolyExpansion.hpp
++ Stokhos_DerivOrthogPolyExpansionImp.hpp
++ Stokhos_ForUQTKOrthogPolyExpansion.hpp
++ Stokhos_ForUQTKOrthogPolyExpansionImp.hpp
++ Stokhos_ExpansionFactory.hpp
++ Stokhos_ExpansionFactoryImp.hpp
++ Stokhos_StieltjesGramSchmidtBuilder.hpp
++ Stokhos_StieltjesGramSchmidtBuilderImp.hpp
++ Stokhos_EpetraSparse3Tensor.hpp
++ Stokhos_ParallelData.hpp
++ Stokhos_SGOperator.hpp
++ Stokhos_MatrixFreeOperator.hpp
++ Stokhos_KLMatrixFreeOperator.hpp
++ Stokhos_KLReducedMatrixFreeOperator.hpp
++ Stokhos_FullyAssembledOperator.hpp
++ Stokhos_SGOperatorFactory.hpp
++ Stokhos_SGPreconditioner.hpp
++ Stokhos_MeanBasedPreconditioner.hpp
++ Stokhos_ApproxGaussSeidelPreconditioner.hpp
++ Stokhos_ApproxJacobiPreconditioner.hpp
++ Stokhos_KroneckerProductPreconditioner.hpp
++ Stokhos_FullyAssembledPreconditioner.hpp
++ Stokhos_SGPreconditionerFactory.hpp
++ Stokhos_AbstractPreconditionerFactory.hpp
++ Stokhos_IfpackPreconditionerFactory.hpp
++ Stokhos_MLPreconditionerFactory.hpp
++ Stokhos_PreconditionerFactory.hpp
++ Stokhos_MLPrecOp.hpp
++ Stokhos_SGModelEvaluator.hpp
++ Stokhos_SGQuadModelEvaluator.hpp
++ Stokhos_SGInverseModelEvaluator.hpp
++ Stokhos_ResponseStatisticModelEvaluator.hpp
++ Stokhos_ProductContainer.hpp
++ Stokhos_ProductContainerImp.hpp
++ Stokhos_VectorOrthogPoly.hpp
++ Stokhos_VectorOrthogPolyImp.hpp
++ Stokhos_Epetra.hpp
++ Stokhos_VectorOrthogPolyTraitsEpetra.hpp
++ Stokhos_ProductEpetraVector.hpp
++ Stokhos_ProductEpetraMultiVector.hpp
++ Stokhos_EpetraVectorOrthogPoly.hpp
++ Stokhos_EpetraMultiVectorOrthogPoly.hpp
++ Stokhos_EpetraOperatorOrthogPoly.hpp
++ Stokhos_ProductEpetraOperator.hpp
++ Stokhos_PCECovarianceOp.hpp
++ Stokhos_PCEAnasaziKL.hpp
++ Stokhos_KL_OneDEigenPair.hpp
++ Stokhos_KL_ProductEigenPair.hpp
++ Stokhos_KL_OneDExponentialCovarianceFunction.hpp
++ Stokhos_KL_OneDExponentialCovarianceFunctionImp.hpp
++ Stokhos_KL_ExponentialRandomField.hpp
++ Stokhos_KL_ExponentialRandomFieldImp.hpp
++ Stokhos_EpetraMultiVectorOperator.hpp
++ Stokhos_BlockDiagonalOperator.hpp
++ Stokhos_MPPreconditioner.hpp
++ Stokhos_MPBlockDiagonalPreconditioner.hpp
++ Stokhos_MPMeanBasedPreconditioner.hpp
++ Stokhos_MPPreconditionerFactory.hpp
++ Stokhos_MPModelEvaluator.hpp
++ Stokhos_SGQuadMPModelEvaluator.hpp
++ Stokhos_MPModelEvaluatorAdapter.hpp
++ Stokhos_MPInverseModelEvaluator.hpp
++ Stokhos_InterlacedOperator.hpp
++ Stokhos_SGModelEvaluator_Interlaced.hpp
++ Stokhos_SGModelEvaluator_Adaptive.hpp
++ Stokhos_BasisInteractionGraph.hpp
++ Stokhos_AdaptivityUtils.hpp
++ Stokhos_AdaptivityManager.hpp
++ )
++
++SET(SOURCES ${SOURCES}
++ Stokhos_Version.cpp
++ Stokhos_SparseGridQuadrature.cpp
++ Stokhos_AnisoSparseGridQuadrature.cpp
++ Stokhos_EpetraSparse3Tensor.cpp
++ Stokhos_ParallelData.cpp
++ Stokhos_MatrixFreeOperator.cpp
++ Stokhos_KLMatrixFreeOperator.cpp
++ Stokhos_KLReducedMatrixFreeOperator.cpp
++ Stokhos_FullyAssembledOperator.cpp
++ Stokhos_SGOperatorFactory.cpp
++ Stokhos_MeanBasedPreconditioner.cpp
++ Stokhos_ApproxGaussSeidelPreconditioner.cpp
++ Stokhos_ApproxJacobiPreconditioner.cpp
++ Stokhos_KroneckerProductPreconditioner.cpp
++ Stokhos_FullyAssembledPreconditioner.cpp
++ Stokhos_SGPreconditionerFactory.cpp
++ Stokhos_IfpackPreconditionerFactory.cpp
++ Stokhos_MLPreconditionerFactory.cpp
++ Stokhos_PreconditionerFactory.cpp
++ Stokhos_MLPrecOp.cpp
++ Stokhos_ProductEpetraVector.cpp
++ Stokhos_ProductEpetraMultiVector.cpp
++ Stokhos_ProductEpetraOperator.cpp
++ Stokhos_EpetraVectorOrthogPoly.cpp
++ Stokhos_EpetraMultiVectorOrthogPoly.cpp
++ Stokhos_EpetraOperatorOrthogPoly.cpp
++ Stokhos_SGModelEvaluator.cpp
++ Stokhos_SGQuadModelEvaluator.cpp
++ Stokhos_SGInverseModelEvaluator.cpp
++ Stokhos_ResponseStatisticModelEvaluator.cpp
++ Stokhos_PCECovarianceOp.cpp
++ Stokhos_PCEAnasaziKL.cpp
++ Stokhos_EpetraMultiVectorOperator.cpp
++ Stokhos_BlockDiagonalOperator.cpp
++ Stokhos_MPBlockDiagonalPreconditioner.cpp
++ Stokhos_MPMeanBasedPreconditioner.cpp
++ Stokhos_MPPreconditionerFactory.cpp
++ Stokhos_MPModelEvaluator.cpp
++ Stokhos_SGQuadMPModelEvaluator.cpp
++ Stokhos_MPModelEvaluatorAdapter.cpp
++ Stokhos_MPInverseModelEvaluator.cpp
++ Stokhos_InterlacedOperator.cpp
++ Stokhos_SGModelEvaluator_Interlaced.cpp
++ Stokhos_SGModelEvaluator_Adaptive.cpp
++ Stokhos_BasisInteractionGraph.cpp
++ Stokhos_AdaptivityUtils.cpp
++ Stokhos_AdaptivityManager.cpp
++ )
++
++# Sacado
++IF (Stokhos_ENABLE_Sacado)
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado)
++ SET(HEADERS ${HEADERS}
++ sacado/Stokhos_Sacado.hpp
++ sacado/Stokhos_Sacado_MathFunctions.hpp
++ sacado/Sacado_PCE_OrthogPoly.hpp
++ sacado/Sacado_PCE_OrthogPolyImp.hpp
++ sacado/Sacado_PCE_OrthogPolyTraits.hpp
++ sacado/Sacado_ETPCE_OrthogPoly.hpp
++ sacado/Sacado_ETPCE_OrthogPolyImp.hpp
++ sacado/Sacado_ETPCE_OrthogPolyTraits.hpp
++ sacado/Sacado_ETPCE_OrthogPolyOps.hpp
++ sacado/Sacado_ETV_Vector.hpp
++ sacado/Sacado_ETV_VectorImp.hpp
++ sacado/Sacado_ETV_VectorOps.hpp
++ sacado/Sacado_ETV_VectorTraits.hpp
++ )
++ SET(SOURCES ${SOURCES}
++ sacado/Sacado_PCE_OrthogPoly.cpp
++ sacado/Sacado_ETPCE_OrthogPoly.cpp
++ )
++ENDIF()
++
++# NOX
++IF (Stokhos_ENABLE_NOX AND NOX_ENABLE_ABSTRACT_IMPLEMENTATION_EPETRA AND
++ NOX_ENABLE_EpetraExt)
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/nox)
++ SET(HEADERS ${HEADERS}
++ Stokhos_GaussSeidelPreconditioner.hpp
++ nox/NOX_Epetra_LinearSystem_SGJacobi.hpp
++ nox/NOX_Epetra_LinearSystem_SGGS.hpp
++ nox/NOX_Epetra_LinearSystem_MPBD.hpp
++ )
++ SET(SOURCES ${SOURCES}
++ Stokhos_GaussSeidelPreconditioner.cpp
++ nox/NOX_Epetra_LinearSystem_SGJacobi.cpp
++ nox/NOX_Epetra_LinearSystem_SGGS.cpp
++ nox/NOX_Epetra_LinearSystem_MPBD.cpp
++ )
++ENDIF()
++
++# CUDA/Thrust
++IF (Stokhos_ENABLE_Thrust)
++ # this is a manual include of Teuchos dirs, necessary because CUDA_COMPILE
++ # doesn't recognize the package architecture system.
++ CUDA_INCLUDE_DIRECTORIES(
++ ${Teuchos_INCLUDE_DIRS}
++ )
++ CUDA_COMPILE(CUDA_SOURCES
++ Stokhos_CUDAStorage.cu
++ Stokhos_CUDAQuadOrthogPolyExpansion.cu
++ )
++ SET(HEADERS ${HEADERS}
++ Stokhos_CUDAStorage.hpp
++ Stokhos_CUDAStorageImp.hpp
++ Stokhos_CUDAQuadOrthogPolyExpansion.hpp
++ Stokhos_CUDAQuadOrthogPolyExpansionImp.hpp
++ )
++ SET(SOURCES ${SOURCES} ${CUDA_SOURCES})
++ENDIF()
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ stokhos
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stratimikos/adapters/amesos/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stratimikos/adapters/amesos/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stratimikos/adapters/amesos/src/CMakeLists.txt 2012-01-09 18:05:26.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stratimikos/adapters/amesos/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -16,7 +16,7 @@
)
@@ -2729,10 +9354,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt 2012-01-09 18:05:25.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stratimikos/adapters/aztecoo/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -16,7 +16,7 @@
)
@@ -2742,10 +9366,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stratimikos/adapters/belos/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stratimikos/adapters/belos/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stratimikos/adapters/belos/src/CMakeLists.txt 2012-01-09 18:05:25.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stratimikos/adapters/belos/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -11,7 +11,7 @@
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
@@ -2755,10 +9378,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt 2012-01-09 18:05:26.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stratimikos/adapters/ifpack/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -12,7 +12,7 @@
)
@@ -2768,10 +9390,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stratimikos/adapters/ml/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stratimikos/adapters/ml/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stratimikos/adapters/ml/src/CMakeLists.txt 2012-01-09 18:05:25.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stratimikos/adapters/ml/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -12,7 +12,7 @@
)
@@ -2781,10 +9402,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/stratimikos/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/stratimikos/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/stratimikos/src/CMakeLists.txt 2012-01-09 18:05:23.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/stratimikos/src/CMakeLists.txt 2012-02-06 13:03:19.275235176 +0100
@@ -45,33 +45,33 @@
ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
@@ -2825,10 +9445,21 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
DEPLIBS ${DEPLIBS}
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/Sundance/Playa/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/Sundance/Playa/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/Sundance/Playa/src/CMakeLists.txt 2012-01-09 18:06:31.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/Sundance/Playa/src/CMakeLists.txt 2012-02-06 14:35:46.671038964 +0100
+@@ -289,7 +289,7 @@
+ PRINT_VAR(DEPLIBS)
+
+ PACKAGE_ADD_LIBRARY(
+- playa
++ trilinos_playa
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/Sundance/src-core/CMakeLists.txt trilinos-10.8.5.dfsg/packages/Sundance/src-core/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/Sundance/src-core/CMakeLists.txt 2012-01-09 18:06:41.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/Sundance/src-core/CMakeLists.txt 2012-02-06 14:35:07.935040333 +0100
@@ -395,8 +395,8 @@
#
@@ -2840,10 +9471,415 @@
- 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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/Sundance/src-core/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/Sundance/src-core/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/Sundance/src-core/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/Sundance/src-core/CMakeLists.txt.orig 2012-02-06 12:48:01.995267621 +0100
+@@ -0,0 +1,402 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/../src-utils/SundanceConfig.h
++ )
++
++#
++# UserExprs files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src-utils/Utilities)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src-std-mesh/Interface)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/UserExprs)
++
++APPEND_SET(HEADERS
++ UserExprs/SundanceCellDiameterExpr.hpp
++ UserExprs/SundanceCurveNormExpr.hpp
++ UserExprs/SundanceCellVectorExpr.hpp
++ UserExprs/SundanceComplexExpr.hpp
++ UserExprs/SundanceCoordExpr.hpp
++ UserExprs/SundanceDerivative.hpp
++ UserExprs/SundanceEssentialBC.hpp
++ UserExprs/SundanceExpr.hpp
++ UserExprs/SundanceFunctionalDerivative.hpp
++ UserExprs/SundanceIntegral.hpp
++ UserExprs/SundanceParameter.hpp
++ UserExprs/SundancePointwiseUserDefFunctor.hpp
++ UserExprs/SundanceStdMathOps.hpp
++ UserExprs/SundanceUnknownParameter.hpp
++ UserExprs/SundanceUserDefFunctor.hpp
++ UserExprs/SundanceUserDefOp.hpp
++ UserExprs/SundanceVectorCalculus.hpp
++ UserExprs/SundanceCurveExpr.hpp
++ UserExprs/SundanceFunctionalEvaluatorBase.hpp
++ )
++
++APPEND_SET(SOURCES
++ UserExprs/SundanceCellDiameterExpr.cpp
++ UserExprs/SundanceCurveNormExpr.cpp
++ UserExprs/SundanceCellVectorExpr.cpp
++ UserExprs/SundanceComplexExpr.cpp
++ UserExprs/SundanceCoordExpr.cpp
++ UserExprs/SundanceDerivative.cpp
++ UserExprs/SundanceEssentialBC.cpp
++ UserExprs/SundanceExpr.cpp
++ UserExprs/SundanceFunctionalDerivative.cpp
++ UserExprs/SundanceIntegral.cpp
++ UserExprs/SundanceParameter.cpp
++ UserExprs/SundancePointwiseUserDefFunctor.cpp
++ UserExprs/SundanceStdMathOps.cpp
++ UserExprs/SundanceUnknownParameter.cpp
++ UserExprs/SundanceUserDefFunctor.cpp
++ UserExprs/SundanceUserDefOp.cpp
++ UserExprs/SundanceVectorCalculus.cpp
++ )
++
++#
++# InternalExprs files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/InternalExprs)
++
++APPEND_SET(HEADERS
++ InternalExprs/SundanceBinaryExpr.hpp
++ InternalExprs/SundanceConstantExpr.hpp
++ InternalExprs/SundanceDerivOfSymbFunc.hpp
++ InternalExprs/SundanceDiffOp.hpp
++ InternalExprs/SundanceDiscreteFuncElement.hpp
++ InternalExprs/SundanceEvaluatableExpr.hpp
++ InternalExprs/SundanceExplicitFunctionalDerivativeElement.hpp
++ InternalExprs/SundanceExprBase.hpp
++ InternalExprs/SundanceExprWithChildren.hpp
++ InternalExprs/SundanceFuncElementBase.hpp
++ InternalExprs/SundanceFuncSetAccumulator.hpp
++ InternalExprs/SundanceFunctionalPolynomial.hpp
++ InternalExprs/SundanceFunctionWithID.hpp
++ InternalExprs/SundanceListExpr.hpp
++ InternalExprs/SundanceNonlinearExpr.hpp
++ InternalExprs/SundanceNonlinearUnaryOp.hpp
++ InternalExprs/SundanceParameterData.hpp
++ InternalExprs/SundanceProductExpr.hpp
++ InternalExprs/SundanceScalarExpr.hpp
++ InternalExprs/SundanceSparsitySubset.hpp
++ InternalExprs/SundanceSparsitySuperset.hpp
++ InternalExprs/SundanceSpatiallyConstantExpr.hpp
++ InternalExprs/SundanceSumExpr.hpp
++ InternalExprs/SundanceSumOfBCs.hpp
++ InternalExprs/SundanceSumOfIntegrals.hpp
++ InternalExprs/SundanceSymbPreprocessor.hpp
++ InternalExprs/SundanceSymbolicFuncElement.hpp
++ InternalExprs/SundanceSymbolicFunc.hpp
++ InternalExprs/SundanceTestFuncElement.hpp
++ InternalExprs/SundanceUnaryExpr.hpp
++ InternalExprs/SundanceUnaryMinus.hpp
++ InternalExprs/SundanceUnknownFuncElement.hpp
++ InternalExprs/SundanceUnknownParameterElement.hpp
++ InternalExprs/SundanceUserDefFunctorElement.hpp
++ InternalExprs/SundanceUserDefOpElement.hpp
++ InternalExprs/SundanceZeroExpr.hpp
++ )
++
++APPEND_SET(SOURCES
++ InternalExprs/SundanceBinaryExpr.cpp
++ InternalExprs/SundanceConstantExpr.cpp
++ InternalExprs/SundanceDerivOfSymbFunc.cpp
++ InternalExprs/SundanceDiffOp.cpp
++ InternalExprs/SundanceDiscreteFuncElement.cpp
++ InternalExprs/SundanceEvaluatableExpr.cpp
++ InternalExprs/SundanceExplicitFunctionalDerivativeElement.cpp
++ InternalExprs/SundanceExprBase.cpp
++ InternalExprs/SundanceExprWithChildren.cpp
++ InternalExprs/SundanceFuncElementBase.cpp
++ InternalExprs/SundanceFunctionalPolynomial.cpp
++ InternalExprs/SundanceFunctionWithID.cpp
++ InternalExprs/SundanceListExpr.cpp
++ InternalExprs/SundanceNonlinearExpr.cpp
++ InternalExprs/SundanceNonlinearUnaryOp.cpp
++ InternalExprs/SundanceProductExpr.cpp
++ InternalExprs/SundanceScalarExpr.cpp
++ InternalExprs/SundanceSparsitySubset.cpp
++ InternalExprs/SundanceSparsitySuperset.cpp
++ InternalExprs/SundanceSpatiallyConstantExpr.cpp
++ InternalExprs/SundanceSumExpr.cpp
++ InternalExprs/SundanceSumOfBCs.cpp
++ InternalExprs/SundanceSumOfIntegrals.cpp
++ InternalExprs/SundanceSymbPreprocessor.cpp
++ InternalExprs/SundanceSymbolicFuncElement.cpp
++ InternalExprs/SundanceSymbolicFunc.cpp
++ InternalExprs/SundanceTestFuncElement.cpp
++ InternalExprs/SundanceUnaryExpr.cpp
++ InternalExprs/SundanceUnaryMinus.cpp
++ InternalExprs/SundanceUnknownFuncElement.cpp
++ InternalExprs/SundanceUnknownParameterElement.cpp
++ InternalExprs/SundanceUserDefFunctorElement.cpp
++ InternalExprs/SundanceUserDefOpElement.cpp
++ InternalExprs/SundanceZeroExpr.cpp
++ )
++
++#
++# Evaluation files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Evaluation)
++
++APPEND_SET(HEADERS
++ Evaluation/SundanceBinaryEvaluator.hpp
++ Evaluation/SundanceCellDiameterEvaluator.hpp
++ Evaluation/SundanceCurveNormEvaluator.hpp
++ Evaluation/SundanceCellVectorEvaluator.hpp
++ Evaluation/SundanceChainRuleEvaluator.hpp
++ Evaluation/SundanceChainRuleSum.hpp
++ Evaluation/SundanceConstantEvaluator.hpp
++ Evaluation/SundanceCoordExprEvaluator.hpp
++ Evaluation/SundanceDerivOfSymbFuncEvaluator.hpp
++ Evaluation/SundanceDiscreteFuncEvaluator.hpp
++ Evaluation/SundanceDiffOpEvaluator.hpp
++ Evaluation/SundanceEFDEEvaluator.hpp
++ Evaluation/SundanceEvalManager.hpp
++ Evaluation/SundanceEvaluator.hpp
++ Evaluation/SundanceEvaluatorFactory.hpp
++ Evaluation/SundanceNonlinearUnaryOpEvaluator.hpp
++ Evaluation/SundanceNullEvaluator.hpp
++ Evaluation/SundanceProductEvaluator.hpp
++ Evaluation/SundanceStringEvalMediator.hpp
++ Evaluation/SundanceSubtypeEvaluator.hpp
++ Evaluation/SundanceSumEvaluator.hpp
++ Evaluation/SundanceSymbolicFuncEvaluator.hpp
++ Evaluation/SundanceTempStack.hpp
++ Evaluation/SundanceUnaryEvaluator.hpp
++ Evaluation/SundanceUnaryMinusEvaluator.hpp
++ Evaluation/SundanceUserDefOpCommonEvaluator.hpp
++ Evaluation/SundanceUserDefOpEvaluator.hpp
++ )
++
++APPEND_SET(SOURCES
++ Evaluation/SundanceCellDiameterEvaluator.cpp
++ Evaluation/SundanceCurveNormEvaluator.cpp
++ Evaluation/SundanceCellVectorEvaluator.cpp
++ Evaluation/SundanceChainRuleEvaluator.cpp
++ Evaluation/SundanceChainRuleSum.cpp
++ Evaluation/SundanceConstantEvaluator.cpp
++ Evaluation/SundanceCoordExprEvaluator.cpp
++ Evaluation/SundanceDerivOfSymbFuncEvaluator.cpp
++ Evaluation/SundanceDiscreteFuncEvaluator.cpp
++ Evaluation/SundanceDiffOpEvaluator.cpp
++ Evaluation/SundanceEFDEEvaluator.cpp
++ Evaluation/SundanceEvalManager.cpp
++ Evaluation/SundanceEvaluator.cpp
++ Evaluation/SundanceNonlinearUnaryOpEvaluator.cpp
++ Evaluation/SundanceNullEvaluator.cpp
++ Evaluation/SundanceProductEvaluator.cpp
++ Evaluation/SundanceStringEvalMediator.cpp
++ Evaluation/SundanceSumEvaluator.cpp
++ Evaluation/SundanceSymbolicFuncEvaluator.cpp
++ Evaluation/SundanceTempStack.cpp
++ Evaluation/SundanceUnaryMinusEvaluator.cpp
++ Evaluation/SundanceUserDefOpCommonEvaluator.cpp
++ Evaluation/SundanceUserDefOpEvaluator.cpp
++ )
++
++#
++# FrameworkInterface files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/FrameworkInterface)
++
++APPEND_SET(HEADERS
++ FrameworkInterface/SundanceAbstractEvalMediator.hpp
++ FrameworkInterface/SundanceAlgebraSpecifier.hpp
++ FrameworkInterface/SundanceCommonFuncDataStub.hpp
++ FrameworkInterface/SundanceComputationType.hpp
++ FrameworkInterface/SundanceDeriv.hpp
++ FrameworkInterface/SundanceDerivSet.hpp
++ FrameworkInterface/SundanceDiscreteFuncDataStub.hpp
++ FrameworkInterface/SundanceDiscreteFunctionStub.hpp
++ FrameworkInterface/SundanceEquationSet.hpp
++ FrameworkInterface/SundanceEvalContext.hpp
++ FrameworkInterface/SundanceEvalVector.hpp
++ FrameworkInterface/SundanceFunctionIdentifier.hpp
++ FrameworkInterface/SundanceFunctionSupportResolver.hpp
++ FrameworkInterface/SundanceLoadableVector.hpp
++ FrameworkInterface/SundanceMultiIndex.hpp
++ FrameworkInterface/SundanceMultipleDeriv.hpp
++ FrameworkInterface/SundanceQuadratureFamilyStub.hpp
++ FrameworkInterface/SundanceRegionQuadCombo.hpp
++ FrameworkInterface/SundanceSpatialDerivSpecifier.hpp
++ FrameworkInterface/SundanceSymbolicFuncDescriptor.hpp
++ FrameworkInterface/SundanceTestFuncDataStub.hpp
++ FrameworkInterface/SundanceTestFunctionStub.hpp
++ FrameworkInterface/SundanceUnknownFuncDataStub.hpp
++ FrameworkInterface/SundanceUnknownFunctionStub.hpp
++ )
++
++APPEND_SET(SOURCES
++ FrameworkInterface/SundanceAbstractEvalMediator.cpp
++ FrameworkInterface/SundanceAlgebraSpecifier.cpp
++ FrameworkInterface/SundanceDeriv.cpp
++ FrameworkInterface/SundanceDerivSet.cpp
++ FrameworkInterface/SundanceDiscreteFunctionStub.cpp
++ FrameworkInterface/SundanceEquationSet.cpp
++ FrameworkInterface/SundanceEvalVector.cpp
++ FrameworkInterface/SundanceFunctionIdentifier.cpp
++ FrameworkInterface/SundanceFunctionSupportResolver.cpp
++ FrameworkInterface/SundanceLoadableVector.cpp
++ FrameworkInterface/SundanceMultiIndex.cpp
++ FrameworkInterface/SundanceMultipleDeriv.cpp
++ FrameworkInterface/SundanceQuadratureFamilyStub.cpp
++ FrameworkInterface/SundanceRegionQuadCombo.cpp
++ FrameworkInterface/SundanceSpatialDerivSpecifier.cpp
++ FrameworkInterface/SundanceTestFunctionStub.cpp
++ FrameworkInterface/SundanceUnknownFunctionStub.cpp
++ )
++
++#
++# Transformations files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/SymbolicTransformations)
++
++APPEND_SET(HEADERS
++ SymbolicTransformations/SundanceSymbolicTransformation.hpp
++ SymbolicTransformations/SundanceSumTransformation.hpp
++ SymbolicTransformations/SundanceSumTransformationSequence.hpp
++ SymbolicTransformations/SundanceStdSumTransformations.hpp
++ SymbolicTransformations/SundanceProductTransformation.hpp
++ SymbolicTransformations/SundanceProductTransformationSequence.hpp
++ SymbolicTransformations/SundanceStdProductTransformations.hpp
++ )
++
++APPEND_SET(SOURCES
++ SymbolicTransformations/SundanceSymbolicTransformation.cpp
++ SymbolicTransformations/SundanceSumTransformation.cpp
++ SymbolicTransformations/SundanceSumTransformationSequence.cpp
++ SymbolicTransformations/SundanceStdSumTransformations.cpp
++ SymbolicTransformations/SundanceProductTransformation.cpp
++ SymbolicTransformations/SundanceProductTransformationSequence.cpp
++ SymbolicTransformations/SundanceStdProductTransformations.cpp
++ )
++
++#
++# Spectral files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Spectral)
++
++APPEND_SET(HEADERS
++ Spectral/chaos.h
++ Spectral/VECMAT.h
++ Spectral/cijk.h
++ Spectral/SundanceHermiteSpectralBasis.hpp
++ Spectral/SundanceSpectralBasis.hpp
++ Spectral/SundanceSpectralBasisBase.hpp
++ Spectral/SundanceSpectralExpr.hpp
++ Spectral/SundanceSpectralPreprocessor.hpp
++ Spectral/SundanceStokhosBasisWrapper.hpp
++ )
++
++APPEND_SET(SOURCES
++ Spectral/SundanceHermiteSpectralBasis.cpp
++ Spectral/SundanceSpectralExpr.cpp
++ Spectral/SundanceSpectralPreprocessor.cpp
++ Spectral/SundanceStokhosBasisWrapper.cpp
++ )
++
++#
++# Test Utilities files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/TestingUtilities)
++
++APPEND_SET(HEADERS
++ TestingUtilities/SundanceADBasis.hpp
++ TestingUtilities/SundanceADCoord.hpp
++ TestingUtilities/SundanceADDerivative.hpp
++ TestingUtilities/SundanceADField.hpp
++ TestingUtilities/SundanceEvaluationTester.hpp
++ TestingUtilities/SundanceTestDiscreteFuncData.hpp
++ TestingUtilities/SundanceTestDiscreteFunction.hpp
++ TestingUtilities/SundanceTestEvalMediator.hpp
++ TestingUtilities/SundanceTestUnknownFuncData.hpp
++ TestingUtilities/SundanceTestUnknownFunction.hpp
++ )
++
++APPEND_SET(SOURCES
++ TestingUtilities/SundanceADBasis.cpp
++ TestingUtilities/SundanceADCoord.cpp
++ TestingUtilities/SundanceADDerivative.cpp
++ TestingUtilities/SundanceADField.cpp
++ TestingUtilities/SundanceEvaluationTester.cpp
++ TestingUtilities/SundanceTestDiscreteFunction.cpp
++ TestingUtilities/SundanceTestEvalMediator.cpp
++ TestingUtilities/SundanceTestUnknownFuncData.cpp
++ TestingUtilities/SundanceTestUnknownFunction.cpp
++ )
++
++#
++# Parametrized curves
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ParametrizedCurves)
++
++APPEND_SET(HEADERS
++ ParametrizedCurves/SundanceCurveBase.hpp
++ ParametrizedCurves/SundanceCircle.hpp
++ ParametrizedCurves/SundanceBox2D.hpp
++ ParametrizedCurves/SundanceBox3D.hpp
++ ParametrizedCurves/SundanceEllipse2D.hpp
++ ParametrizedCurves/SundanceSphere.hpp
++ ParametrizedCurves/SundanceLine2D.hpp
++ ParametrizedCurves/SundancePlane3D.hpp
++ ParametrizedCurves/SundanceParamCurveIntegral.hpp
++ ParametrizedCurves/SundanceParametrizedCurve.hpp
++ ParametrizedCurves/SundanceDummyParametrizedCurve.hpp
++ ParametrizedCurves/SundancePolygon2D.hpp
++ )
++
++APPEND_SET(SOURCES
++ ParametrizedCurves/SundanceCircle.cpp
++ ParametrizedCurves/SundanceBox2D.cpp
++ ParametrizedCurves/SundanceBox3D.cpp
++ ParametrizedCurves/SundanceEllipse2D.cpp
++ ParametrizedCurves/SundanceSphere.cpp
++ ParametrizedCurves/SundanceLine2D.cpp
++ ParametrizedCurves/SundancePlane3D.cpp
++ ParametrizedCurves/SundanceParamCurveIntegral.cpp
++ ParametrizedCurves/SundanceParametrizedCurve.cpp
++ ParametrizedCurves/SundancePolygon2D.cpp
++ )
++
++IF (TPL_ENABLE_MPI)
++ENDIF()
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ sundanceCore
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ DEPLIBS sundanceUtils sundanceInterop playa
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/Sundance/src-interop/CMakeLists.txt trilinos-10.8.5.dfsg/packages/Sundance/src-interop/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/Sundance/src-interop/CMakeLists.txt 2012-01-09 18:06:27.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/Sundance/src-interop/CMakeLists.txt 2012-02-06 14:35:41.711039138 +0100
@@ -50,8 +50,8 @@
#
@@ -2855,10 +9891,23 @@
- 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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/Sundance/src-pdeopt/CMakeLists.txt trilinos-10.8.5.dfsg/packages/Sundance/src-pdeopt/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/Sundance/src-pdeopt/CMakeLists.txt 2012-01-09 18:06:36.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/Sundance/src-pdeopt/CMakeLists.txt 2012-02-06 14:36:06.639038257 +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
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/Sundance/src-std-framework/CMakeLists.txt trilinos-10.8.5.dfsg/packages/Sundance/src-std-framework/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/Sundance/src-std-framework/CMakeLists.txt 2012-01-09 18:06:33.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/Sundance/src-std-framework/CMakeLists.txt 2012-02-06 14:35:28.351039612 +0100
@@ -348,8 +348,8 @@
#
@@ -2870,10 +9919,368 @@
- 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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/Sundance/src-std-framework/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/Sundance/src-std-framework/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/Sundance/src-std-framework/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/Sundance/src-std-framework/CMakeLists.txt.orig 2012-02-06 12:48:01.987267621 +0100
+@@ -0,0 +1,355 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++
++#
++# Elements files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../Playa/src)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src-core/UserExprs)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src-core/InternalExprs)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../src-core/FrameworkInterface)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Elements)
++
++APPEND_SET(HEADERS
++ Elements/SundanceBasisDOFTopologyBase.hpp
++ Elements/SundanceBasisFamilyBase.hpp
++ Elements/SundanceBasisFamily.hpp
++ Elements/SundanceBasisReferenceEvaluationBase.hpp
++ Elements/SundanceBernstein.hpp
++ Elements/SundanceBubble.hpp
++ Elements/SundanceClosedNewtonCotes.hpp
++ Elements/SundanceClosedNewtonCotesType.hpp
++ Elements/SundanceCubicHermite.hpp
++ Elements/SundanceDiscreteFunction.hpp
++ Elements/SundanceDiscreteFunctionData.hpp
++ Elements/SundanceDiscreteSpace.hpp
++ Elements/SundanceEdgeLocalizedBasis.hpp
++ Elements/SundanceFeketeBrickQuadrature.hpp
++ Elements/SundanceFeketeQuadrature.hpp
++ Elements/SundanceFeketeQuadQuadrature.hpp
++ Elements/SundanceFeketeQuadratureType.hpp
++ Elements/SundanceFeketeTriangleQuadrature.hpp
++ Elements/SundanceFourier.hpp
++ Elements/SundanceTrapesoidQuadrature.hpp
++ Elements/SundanceGaussLobattoQuadrature.hpp
++ Elements/SundancePolygonQuadrature.hpp
++ Elements/SundanceFuncWithBasis.hpp
++ Elements/SundanceGauss1D.hpp
++ Elements/SundanceGaussLobatto1D.hpp
++ Elements/SundanceGaussianQuadrature.hpp
++ Elements/SundanceGaussianQuadratureType.hpp
++ Elements/SundanceLagrange.hpp
++ Elements/SundanceNedelec.hpp
++ Elements/SundanceQuadratureFamily.hpp
++ Elements/SundanceQuadratureFamilyBase.hpp
++ Elements/SundanceQuadratureType.hpp
++ Elements/SundanceQuadratureTypeBase.hpp
++ Elements/SundanceRaviartThomas.hpp
++ Elements/SundanceTensorBasisBase.hpp
++ Elements/SundanceTestFunction.hpp
++ Elements/SundanceTestFunctionData.hpp
++ Elements/SundanceTetQuadrature.hpp
++ Elements/SundanceTriangleQuadrature.hpp
++ Elements/SundanceQuadQuadrature.hpp
++ Elements/SundanceBrickQuadrature.hpp
++ Elements/SundanceUnknownFunction.hpp
++ Elements/SundanceUnknownFunctionData.hpp
++ Elements/SundanceLegendre.hpp
++ )
++
++APPEND_SET(SOURCES
++ Elements/SundanceBasisDOFTopologyBase.cpp
++ Elements/SundanceBasisFamily.cpp
++ Elements/SundanceBasisFamilyBase.cpp
++ Elements/SundanceBernstein.cpp
++ Elements/SundanceBubble.cpp
++ Elements/SundanceClosedNewtonCotes.cpp
++ Elements/SundanceClosedNewtonCotesType.cpp
++ Elements/SundanceCubicHermite.cpp
++ Elements/SundanceDiscreteFunction.cpp
++ Elements/SundanceDiscreteFunctionData.cpp
++ Elements/SundanceDiscreteSpace.cpp
++ Elements/SundanceEdgeLocalizedBasis.cpp
++ Elements/SundanceFeketeBrickQuadrature.cpp
++ Elements/SundanceFeketeQuadQuadrature.cpp
++ Elements/SundanceFeketeQuadrature.cpp
++ Elements/SundanceFeketeQuadratureType.cpp
++ Elements/SundanceFeketeTriangleQuadrature.cpp
++ Elements/SundanceFourier.cpp
++ Elements/SundanceTrapesoidQuadrature.cpp
++ Elements/SundanceGaussLobattoQuadrature.cpp
++ Elements/SundancePolygonQuadrature.cpp
++ Elements/SundanceFuncWithBasis.cpp
++ Elements/SundanceGauss1D.cpp
++ Elements/SundanceGaussLobatto1D.cpp
++ Elements/SundanceGaussianQuadrature.cpp
++ Elements/SundanceGaussianQuadratureType.cpp
++ Elements/SundanceLagrange.cpp
++ Elements/SundanceNedelec.cpp
++ Elements/SundanceQuadratureFamily.cpp
++ Elements/SundanceQuadratureFamilyBase.cpp
++ Elements/SundanceQuadratureType.cpp
++ Elements/SundanceRaviartThomas.cpp
++ Elements/SundanceTestFunction.cpp
++ Elements/SundanceTestFunctionData.cpp
++ Elements/SundanceTetQuadrature.cpp
++ Elements/SundanceTriangleQuadrature.cpp
++ Elements/SundanceQuadQuadrature.cpp
++ Elements/SundanceBrickQuadrature.cpp
++ Elements/SundanceUnknownFunction.cpp
++ Elements/SundanceUnknownFunctionData.cpp
++ Elements/SundanceLegendre.cpp
++ )
++
++#
++# DOF Mapping files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/DOFMapping)
++
++APPEND_SET(HEADERS
++ DOFMapping/SundanceBlock.hpp
++ DOFMapping/SundanceDOFMapBase.hpp
++ DOFMapping/SundanceDOFMapBuilder.hpp
++ DOFMapping/SundanceInhomogeneousNodalDOFMap.hpp
++ DOFMapping/SundanceMapStructure.hpp
++ DOFMapping/SundanceMixedDOFMap.hpp
++ DOFMapping/SundanceMixedDOFMapHN.hpp
++ DOFMapping/SundanceNodalDOFMap.hpp
++ DOFMapping/SundanceNodalDOFMapHN.hpp
++ DOFMapping/SundanceInhomogeneousDOFMapHN.hpp
++ DOFMapping/SundancePartialElementDOFMap.hpp
++ DOFMapping/SundanceSpatiallyHomogeneousDOFMapBase.hpp
++ DOFMapping/SundanceHNDoFMapBase.hpp
++ DOFMapping/SundanceHNDoFMapBaseHomogeneous.hpp
++ DOFMapping/SundanceNodalDOFMapHN.hpp
++ DOFMapping/SundanceUnfoldPeriodicDF.hpp
++ )
++
++APPEND_SET(SOURCES
++ DOFMapping/SundanceDOFMapBase.cpp
++ DOFMapping/SundanceDOFMapBuilder.cpp
++ DOFMapping/SundanceInhomogeneousNodalDOFMap.cpp
++ DOFMapping/SundanceMapStructure.cpp
++ DOFMapping/SundanceMixedDOFMap.cpp
++ DOFMapping/SundanceMixedDOFMapHN.cpp
++ DOFMapping/SundanceNodalDOFMap.cpp
++ DOFMapping/SundanceNodalDOFMapHN.cpp
++ DOFMapping/SundanceInhomogeneousDOFMapHN.cpp
++ DOFMapping/SundancePartialElementDOFMap.cpp
++ DOFMapping/SundanceSpatiallyHomogeneousDOFMapBase.cpp
++ DOFMapping/SundanceUnfoldPeriodicDF.cpp
++ )
++
++#
++# Assembly files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Assembly)
++#INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Assembly/ElementIntegration)
++
++APPEND_SET(HEADERS
++ Assembly/SundanceAssembler.hpp
++ Assembly/SundanceAssemblyKernelBase.hpp
++ Assembly/SundanceElementIntegral.hpp
++ Assembly/SundanceFunctionalAssemblyKernel.hpp
++ Assembly/SundanceFunctionalGradientAssemblyKernel.hpp
++ Assembly/SundanceFunctionalEvaluator.hpp
++ Assembly/SundanceGrouperBase.hpp
++ Assembly/SundanceIntegralGroup.hpp
++ Assembly/SundanceIntegrationCellSpecifier.hpp
++ Assembly/SundanceLocalDOFMap.hpp
++ Assembly/SundanceLocalMatrixContainer.hpp
++ Assembly/SundanceMapBundle.hpp
++ Assembly/SundanceMatrixVectorAssemblyKernel.hpp
++ Assembly/SundanceMaximalQuadratureIntegral.hpp
++ Assembly/SundanceQuadratureEvalMediator.hpp
++ Assembly/SundanceQuadratureIntegral.hpp
++ Assembly/SundanceQuadratureIntegralBase.hpp
++ Assembly/SundanceRefIntegral.hpp
++ Assembly/SundanceStdFwkEvalMediator.hpp
++ Assembly/SundanceTrivialGrouper.hpp
++ Assembly/SundanceVectorAssemblyKernel.hpp
++ Assembly/SundanceVectorFillingAssemblyKernel.hpp
++ Assembly/SundanceCurveIntegralCalc.hpp
++ Assembly/SundanceCurveQuadratureIntegral.hpp
++ Assembly/SundanceCurveEvalMediator.hpp
++ )
++
++
++# Assembly/ElementIntegration/SundanceElementIntegralBase.hpp
++# Assembly/ElementIntegration/SundanceElementIntegralFunctional.hpp
++# Assembly/ElementIntegration/SundanceElementIntegralFunctionalCell.hpp
++# Assembly/ElementIntegration/SundanceElementIntegralFunctionalFacet.hpp
++# Assembly/ElementIntegration/SundanceElementIntegralLinearForm.hpp
++# Assembly/ElementIntegration/SundanceElementIntegralLinearFormCell.hpp
++# Assembly/ElementIntegration/SundanceElementIntegralLinearFormFacet.hpp
++# Assembly/ElementIntegration/SundanceElementIntegralBilinearForm.hpp
++# Assembly/ElementIntegration/SundanceElementIntegralBilinearFormCell.hpp
++# Assembly/ElementIntegration/SundanceElementIntegralBilinearFormFacet.hpp
++# Assembly/ElementIntegration/SundanceIQI_HdivLF_DivV_Cell.hpp
++# Assembly/ElementIntegration/SundanceIQI_HdivLF_VN_Facet.hpp
++# Assembly/ElementIntegration/SundanceIQI_VecLF_Vi_Cell.hpp
++# Assembly/ElementIntegration/SundanceIQI_VecLF_Vi_Facet.hpp
++# Assembly/ElementIntegration/SundanceIQI_VecVecBLF_UiVj_Cell.hpp
++# Assembly/ElementIntegration/SundanceIQI_VecVecBLF_UiVj_Facet.hpp
++# Assembly/ElementIntegration/SundanceIQI_ScalVecBLF_UVj_Cell.hpp
++# Assembly/ElementIntegration/SundanceIQI_ScalVecBLF_UVj_Facet.hpp
++# Assembly/ElementIntegration/SundanceIQI_HdivScalBLF_DivUV_Cell.hpp
++# Assembly/ElementIntegration/SundanceIQI_HdivScalBLF_UNV_Facet.hpp
++# Assembly/ElementIntegration/SundanceIQI_HdivHdivBLF_DivUDivV_Cell.hpp
++
++APPEND_SET(SOURCES
++ Assembly/SundanceAssembler.cpp
++ Assembly/SundanceElementIntegral.cpp
++ Assembly/SundanceFunctionalAssemblyKernel.cpp
++ Assembly/SundanceFunctionalEvaluator.cpp
++ Assembly/SundanceGrouperBase.cpp
++ Assembly/SundanceIntegralGroup.cpp
++ Assembly/SundanceLocalDOFMap.cpp
++ Assembly/SundanceLocalMatrixContainer.cpp
++ Assembly/SundanceMapBundle.cpp
++ Assembly/SundanceMatrixVectorAssemblyKernel.cpp
++ Assembly/SundanceMaximalQuadratureIntegral.cpp
++ Assembly/SundanceQuadratureEvalMediator.cpp
++ Assembly/SundanceQuadratureIntegral.cpp
++ Assembly/SundanceQuadratureIntegralBase.cpp
++ Assembly/SundanceRefIntegral.cpp
++ Assembly/SundanceStdFwkEvalMediator.cpp
++ Assembly/SundanceTrivialGrouper.cpp
++ Assembly/SundanceVectorAssemblyKernel.cpp
++ Assembly/SundanceVectorFillingAssemblyKernel.cpp
++ Assembly/SundanceCurveIntegralCalc.cpp
++ Assembly/SundanceCurveQuadratureIntegral.cpp
++ Assembly/SundanceCurveEvalMediator.cpp
++ )
++# Assembly/ElementIntegration/SundanceIQI_HdivLF_DivV_Cell.cpp
++# Assembly/ElementIntegration/SundanceIQI_HdivLF_VN_Facet.cpp
++# Assembly/ElementIntegration/SundanceIQI_VecLF_Vi_Cell.cpp
++# Assembly/ElementIntegration/SundanceIQI_VecLF_Vi_Facet.cpp
++# Assembly/ElementIntegration/SundanceIQI_VecVecBLF_UiVj_Cell.cpp
++# Assembly/ElementIntegration/SundanceIQI_VecVecBLF_UiVj_Facet.cpp
++# Assembly/ElementIntegration/SundanceIQI_ScalVecBLF_UVj_Cell.cpp
++# Assembly/ElementIntegration/SundanceIQI_ScalVecBLF_UVj_Facet.cpp
++# Assembly/ElementIntegration/SundanceIQI_HdivScalBLF_DivUV_Cell.cpp
++# Assembly/ElementIntegration/SundanceIQI_HdivScalBLF_UNV_Facet.cpp
++# Assembly/ElementIntegration/SundanceIQI_HdivHdivBLF_DivUDivV_Cell.cpp
++
++#
++# Problem files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Problem)
++
++APPEND_SET(HEADERS
++ Problem/Sundance.hpp
++ Problem/SundanceAToCDensitySampler.hpp
++ Problem/SundanceAToCPointLocator.hpp
++ Problem/SundanceCToAInterpolator.hpp
++ Problem/SundanceCoordinateSystem.hpp
++ Problem/SundanceEigensolution.hpp
++ Problem/SundanceExprFieldWrapper.hpp
++ Problem/SundanceFunctional.hpp
++ Problem/SundanceL2Projector.hpp
++ Problem/SundanceLinearEigenproblem.hpp
++ Problem/SundanceLinearProblem.hpp
++ Problem/SundanceLinearSolveDriver.hpp
++ Problem/SundanceMeshIOUtils.hpp
++ Problem/SundanceNitscheBC.hpp
++ Problem/SundanceNLOp.hpp
++ Problem/SundancePCDPreconditioner.hpp
++ Problem/SundanceProblemTesting.hpp
++ Problem/SundanceRivaraDriver.hpp
++ Problem/SundanceStochBlockJacobiSolver.hpp
++ Problem/SundanceNonlinearProblem.hpp
++ Problem/SundanceUniformRefinementPair.hpp
++ )
++
++APPEND_SET(SOURCES
++ Problem/Sundance.cpp
++ Problem/SundanceAToCDensitySampler.cpp
++ Problem/SundanceAToCPointLocator.cpp
++ Problem/SundanceCToAInterpolator.cpp
++ Problem/SundanceCoordinateSystem.cpp
++ Problem/SundanceExprFieldWrapper.cpp
++ Problem/SundanceFunctional.cpp
++ Problem/SundanceL2Projector.cpp
++ Problem/SundanceLinearEigenproblem.cpp
++ Problem/SundanceLinearProblem.cpp
++ Problem/SundanceLinearSolveDriver.cpp
++ Problem/SundanceMeshIOUtils.cpp
++ Problem/SundanceNitscheBC.cpp
++ Problem/SundanceNLOp.cpp
++ Problem/SundancePCDPreconditioner.cpp
++ Problem/SundanceProblemTesting.cpp
++ Problem/SundanceRivaraDriver.cpp
++ Problem/SundanceStochBlockJacobiSolver.cpp
++ Problem/SundanceNonlinearProblem.cpp
++ Problem/SundanceUniformRefinementPair.cpp
++ )
++
++
++#
++# Element Matrix & Vector Transformation files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ElementTransformation)
++
++APPEND_SET(HEADERS
++ ElementTransformation/SundanceTransformationBase.hpp
++ ElementTransformation/SundanceAssemblyTransformationBuilder.hpp
++ ElementTransformation/SundanceDiscreteSpaceTransfBuilder.hpp
++ ElementTransformation/SundanceTransformationHN.hpp
++ ElementTransformation/SundanceInequivalentElementTransformation.hpp
++ ElementTransformation/SundanceMatrixStore.hpp
++)
++
++APPEND_SET(SOURCES
++ ElementTransformation/SundanceTransformationBase.cpp
++ ElementTransformation/SundanceAssemblyTransformationBuilder.cpp
++ ElementTransformation/SundanceDiscreteSpaceTransfBuilder.cpp
++ ElementTransformation/SundanceTransformationHN.cpp
++ ElementTransformation/SundanceInequivalentElementTransformation.cpp
++ ElementTransformation/SundanceMatrixStore.cpp
++ )
++
++
++IF (TPL_ENABLE_MPI)
++ENDIF()
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ sundanceStdFwk
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ DEPLIBS sundanceCore sundanceStdMesh sundanceInterop sundanceUtils playa
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/Sundance/src-std-mesh/CMakeLists.txt trilinos-10.8.5.dfsg/packages/Sundance/src-std-mesh/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/Sundance/src-std-mesh/CMakeLists.txt 2012-01-09 18:06:35.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/Sundance/src-std-mesh/CMakeLists.txt 2012-02-06 14:36:34.783037262 +0100
@@ -323,8 +323,8 @@
#
@@ -2885,10 +10292,343 @@
- 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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/Sundance/src-std-mesh/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/Sundance/src-std-mesh/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/Sundance/src-std-mesh/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/Sundance/src-std-mesh/CMakeLists.txt.orig 2012-02-06 12:48:01.963267622 +0100
+@@ -0,0 +1,330 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++
++#
++# Cell Filtres files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/CellFilter)
++
++APPEND_SET(HEADERS
++ CellFilter/SundanceBinaryCellFilter.hpp
++ CellFilter/SundanceBoundaryCellFilter.hpp
++ CellFilter/SundanceBoundaryCellPredicate.hpp
++ CellFilter/SundanceCellFilterBase.hpp
++ CellFilter/SundanceCellFilter.hpp
++ CellFilter/SundanceCellIterator.hpp
++ CellFilter/SundanceCellPredicateBase.hpp
++ CellFilter/SundanceCellPredicate.hpp
++ CellFilter/SundanceCellSetBase.hpp
++ CellFilter/SundanceCellSet.hpp
++ CellFilter/SundanceCFMeshPair.hpp
++ CellFilter/SundanceDimensionalCellFilter.hpp
++ CellFilter/SundanceExplicitCellIterator.hpp
++ CellFilter/SundanceExplicitCellSet.hpp
++ CellFilter/SundanceGIDCellPredicate.hpp
++ CellFilter/SundanceImplicitCellSet.hpp
++ CellFilter/SundanceLabelCellPredicate.hpp
++ CellFilter/SundanceMaximalCellFilter.hpp
++ CellFilter/SundanceNullCellFilter.hpp
++ CellFilter/SundancePositionalCellPredicate.hpp
++ CellFilter/SundanceSideCellFilter.hpp
++ CellFilter/SundanceSubsetCellFilter.hpp
++ CellFilter/SundanceCellCurvePredicate.hpp
++ CellFilter/SundanceSubsetManager.hpp
++ CellFilter/SundanceDomainDefinition.hpp
++ )
++
++APPEND_SET(SOURCES
++ CellFilter/SundanceBinaryCellFilter.cpp
++ CellFilter/SundanceBoundaryCellPredicate.cpp
++ CellFilter/SundanceCellFilterBase.cpp
++ CellFilter/SundanceCellFilter.cpp
++ CellFilter/SundanceCellIterator.cpp
++ CellFilter/SundanceCellPredicateBase.cpp
++ CellFilter/SundanceCellPredicate.cpp
++ CellFilter/SundanceCellSetBase.cpp
++ CellFilter/SundanceCellSet.cpp
++ CellFilter/SundanceCFMeshPair.cpp
++ CellFilter/SundanceDimensionalCellFilter.cpp
++ CellFilter/SundanceExplicitCellSet.cpp
++ CellFilter/SundanceGIDCellPredicate.cpp
++ CellFilter/SundanceImplicitCellSet.cpp
++ CellFilter/SundanceLabelCellPredicate.cpp
++ CellFilter/SundanceMaximalCellFilter.cpp
++ CellFilter/SundanceNullCellFilter.cpp
++ CellFilter/SundancePositionalCellPredicate.cpp
++ CellFilter/SundanceSideCellFilter.cpp
++ CellFilter/SundanceSubsetCellFilter.cpp
++ CellFilter/SundanceCellCurvePredicate.cpp
++ )
++
++#
++# Mesh Interface files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Interface)
++
++APPEND_SET(HEADERS
++ Interface/SundanceCellJacobianBatch.hpp
++ Interface/SundanceCellType.hpp
++ Interface/SundanceCellReordererBase.hpp
++ Interface/SundanceCellReordererImplemBase.hpp
++ Interface/SundanceCellReorderer.hpp
++ Interface/SundanceGeomUtils.hpp
++ Interface/SundanceIncrementallyCreatableMesh.hpp
++ Interface/SundanceIdentityReorderer.hpp
++ Interface/SundanceMaximalCofacetBatch.hpp
++ Interface/SundanceMesh.hpp
++ Interface/SundanceMeshBase.hpp
++ Interface/SundanceMeshTypeBase.hpp
++ Interface/SundanceMeshType.hpp
++ )
++
++APPEND_SET(SOURCES
++ Interface/SundanceCellJacobianBatch.cpp
++ Interface/SundanceCellType.cpp
++ Interface/SundanceCellReordererImplemBase.cpp
++ Interface/SundanceCellReorderer.cpp
++ Interface/SundanceGeomUtils.cpp
++ Interface/SundanceIdentityReorderer.cpp
++ Interface/SundanceMaximalCofacetBatch.cpp
++ Interface/SundanceMesh.cpp
++ Interface/SundanceMeshBase.cpp
++ Interface/SundanceMeshType.cpp
++ )
++
++#
++# Concrete Mesh files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Concrete)
++
++APPEND_SET(HEADERS
++ Concrete/SundanceBasicSimplicialMesh.hpp
++ Concrete/SundanceBasicSimplicialMeshType.hpp
++ Concrete/SundanceBasicVertexView.hpp
++ Concrete/SundanceHNMesh2D.hpp
++ Concrete/SundanceHNMeshType2D.hpp
++ Concrete/SundanceHNMesh3D.hpp
++ Concrete/SundanceHNMeshType3D.hpp
++ Concrete/SundancePeriodicMesh1D.hpp
++ Concrete/SundancePeriodicSingleCellMesh1D.hpp
++ Concrete/SundancePeriodicMeshType1D.hpp
++ )
++
++APPEND_SET(SOURCES
++ Concrete/SundanceBasicSimplicialMesh.cpp
++ Concrete/SundanceBasicVertexView.cpp
++ Concrete/SundanceHNMesh2D.cpp
++ Concrete/SundanceHNMesh3D.cpp
++ Concrete/SundancePeriodicSingleCellMesh1D.cpp
++ Concrete/SundancePeriodicMesh1D.cpp
++ )
++
++
++IF(HAVE_SUNDANCE_PEANO)
++# ========= if Peano grid is defined then we compile the corresponding files =========
++ IF (HAVE_SUNDANCE_PEANO_NO_2D)
++ ELSE()
++ APPEND_SET(HEADERS
++ Concrete/SundancePeanoMeshType2D.hpp
++ Concrete/SundancePeanoMesh2D.hpp
++ )
++ APPEND_SET(SOURCES
++ Concrete/SundancePeanoMesh2D.cpp
++ )
++ ENDIF()
++
++ IF (HAVE_SUNDANCE_PEANO_NO_3D)
++ ELSE()
++ APPEND_SET(HEADERS
++ Concrete/SundancePeanoMeshType3D.hpp
++ Concrete/SundancePeanoMesh3D.hpp
++ )
++ APPEND_SET(SOURCES
++ Concrete/SundancePeanoMesh3D.cpp
++ )
++ ENDIF()
++ENDIF()
++
++#
++# Mesh Source files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Sources)
++
++APPEND_SET(HEADERS
++ Sources/SundanceExodusMeshReader.hpp
++ Sources/SundanceExodusNetCDFMeshReader.hpp
++ Sources/SundanceMeshBuilder.hpp
++ Sources/SundanceMeshReaderBase.hpp
++ Sources/SundanceMeshSourceBase.hpp
++ Sources/SundanceMeshSource.hpp
++ Sources/SundancePartitionedLineMesher.hpp
++ Sources/SundancePartitionedRectangleMesher.hpp
++ Sources/SundanceTriangleMeshReader.hpp
++ Sources/SundanceBamgMeshReader.hpp
++ Sources/SundanceHNMesher2D.hpp
++ Sources/SundanceHNMesher3D.hpp
++ Sources/SundanceOneCellTestMesher.hpp
++ Sources/SundancePeriodicLineMesher.hpp
++ )
++
++APPEND_SET(SOURCES
++ Sources/SundanceExodusMeshReader.cpp
++ Sources/SundanceExodusNetCDFMeshReader.cpp
++ Sources/SundanceMeshBuilder.cpp
++ Sources/SundanceMeshReaderBase.cpp
++ Sources/SundanceMeshSourceBase.cpp
++ Sources/SundanceMeshSource.cpp
++ Sources/SundancePartitionedLineMesher.cpp
++ Sources/SundancePartitionedRectangleMesher.cpp
++ Sources/SundanceTriangleMeshReader.cpp
++ Sources/SundanceBamgMeshReader.cpp
++ Sources/SundanceHNMesher2D.cpp
++ Sources/SundanceHNMesher3D.cpp
++ Sources/SundanceOneCellTestMesher.cpp
++ )
++
++IF(HAVE_SUNDANCE_PEANO)
++# ========= if Peano grid is defined then we compile the corresponding files =========
++ IF (HAVE_SUNDANCE_PEANO_NO_2D)
++ ELSE()
++ APPEND_SET(HEADERS
++ Sources/SundancePeanoMesher2D.hpp
++ )
++ APPEND_SET(SOURCES
++ Sources/SundancePeanoMesher2D.cpp
++ )
++ ENDIF()
++
++ IF (HAVE_SUNDANCE_PEANO_NO_3D)
++ ELSE()
++ APPEND_SET(HEADERS
++ Sources/SundancePeanoMesher3D.hpp
++ )
++ APPEND_SET(SOURCES
++ Sources/SundancePeanoMesher3D.cpp
++ )
++ ENDIF()
++ENDIF()
++#
++# Mesh Transformation files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Transformations)
++
++APPEND_SET(HEADERS
++ Transformations/SundanceExtrusionMeshTransformation.hpp
++ Transformations/SundanceFileIOChacoPartitioner.hpp
++ Transformations/SundanceMeshTransformationBase.hpp
++ Transformations/SundanceMeshTransformation.hpp
++ Transformations/SundanceRivaraEdge.hpp
++ Transformations/SundanceRivaraElement.hpp
++ Transformations/SundanceRivaraElementIterator.hpp
++ Transformations/SundanceRivaraFace.hpp
++ Transformations/SundanceRivaraMesh.hpp
++ Transformations/SundanceRivaraNode.hpp
++ Transformations/SundanceRivaraTreeNode.hpp
++ Transformations/SundanceSerialPartitionerBase.hpp
++ )
++
++APPEND_SET(SOURCES
++ Transformations/SundanceExtrusionMeshTransformation.cpp
++ Transformations/SundanceFileIOChacoPartitioner.cpp
++ Transformations/SundanceMeshTransformationBase.cpp
++ Transformations/SundanceMeshTransformation.cpp
++ Transformations/SundanceRivaraEdge.cpp
++ Transformations/SundanceRivaraElement.cpp
++ Transformations/SundanceRivaraElementIterator.cpp
++ Transformations/SundanceRivaraMesh.cpp
++ Transformations/SundanceRivaraNode.cpp
++ Transformations/SundanceRivaraTreeNode.cpp
++ Transformations/SundanceSerialPartitionerBase.cpp
++ )
++
++#
++# Mesh Writers files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Writers)
++
++APPEND_SET(HEADERS
++ Writers/SundanceCellLIDMappedFieldWrapper.hpp
++ Writers/SundanceExodusWriter.hpp
++ Writers/SundanceFieldBase.hpp
++ Writers/SundanceFieldWriter.hpp
++ Writers/SundanceFieldWriterBase.hpp
++ Writers/SundanceMatlabWriter.hpp
++ Writers/SundanceTriangleWriter.hpp
++ Writers/SundanceVerboseFieldWriter.hpp
++ Writers/SundanceVTKWriter.hpp
++ )
++
++APPEND_SET(SOURCES
++ Writers/SundanceExodusWriter.cpp
++ Writers/SundanceFieldBase.cpp
++ Writers/SundanceFieldWriter.cpp
++ Writers/SundanceFieldWriterBase.cpp
++ Writers/SundanceMatlabWriter.cpp
++ Writers/SundanceTriangleWriter.cpp
++ Writers/SundanceVerboseFieldWriter.cpp
++ Writers/SundanceVTKWriter.cpp
++ )
++
++#
++# Mesh Refinement (error estimate) files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Refinement)
++
++APPEND_SET(HEADERS
++ Refinement/SundanceRefinementBase.hpp
++ Refinement/SundanceRefinementClass.hpp
++ )
++
++APPEND_SET(SOURCES
++ Refinement/SundanceRefinementBase.cpp
++ Refinement/SundanceRefinementClass.cpp
++ )
++
++
++IF (TPL_ENABLE_MPI)
++ENDIF()
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ sundanceStdMesh
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ DEPLIBS sundanceCore sundanceInterop sundanceUtils playa
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/Sundance/src-utils/CMakeLists.txt trilinos-10.8.5.dfsg/packages/Sundance/src-utils/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/Sundance/src-utils/CMakeLists.txt 2012-01-09 18:06:33.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/Sundance/src-utils/CMakeLists.txt 2012-02-06 14:35:14.223040112 +0100
@@ -90,8 +90,8 @@
#
@@ -2900,10 +10640,122 @@
- 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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/Sundance/src-utils/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/Sundance/src-utils/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/Sundance/src-utils/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/Sundance/src-utils/CMakeLists.txt.orig 2012-02-06 12:48:01.991267621 +0100
+@@ -0,0 +1,97 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++PACKAGE_CONFIGURE_FILE(SundanceConfig.h)
++PACKAGE_CONFIGURE_FILE(SundanceDefaultPath.hpp)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/SundanceDefaultPath.hpp
++ ${CMAKE_CURRENT_BINARY_DIR}/SundanceConfig.h
++ )
++
++#
++# Utils files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities)
++
++APPEND_SET(HEADERS
++ Utilities/SundanceADReal.hpp
++ Utilities/SundanceArrayOfTuples.hpp
++ Utilities/SundanceCollectiveExceptionCheck.hpp
++ Utilities/SundanceCombinatorialUtils.hpp
++ Utilities/SundanceDebug.hpp
++ Utilities/SundanceDefs.hpp
++ Utilities/SundanceEnumTypeField.hpp
++ Utilities/SundanceFunctorDomain.hpp
++ Utilities/SundanceIntHashSet.hpp
++ Utilities/SundanceIntVec.hpp
++ Utilities/SundanceMap.hpp
++ Utilities/SundanceMultiSet.hpp
++ Utilities/SundanceNamedObject.hpp
++ Utilities/SundanceNoncopyable.hpp
++ Utilities/SundanceObjectWithInstanceID.hpp
++ Utilities/SundanceObjectWithVerbosity.hpp
++ Utilities/SundanceOrderedHandle.hpp
++ Utilities/SundanceOrderedTuple.hpp
++ Utilities/SundanceOut.hpp
++ Utilities/SundanceParamUtils.hpp
++ Utilities/SundancePathUtils.hpp
++ Utilities/SundancePoint.hpp
++ Utilities/SundanceSet.hpp
++ Utilities/SundanceStdMathFunctors.hpp
++ Utilities/SundanceTypeUtils.hpp
++ Utilities/SundanceUnaryFunctor.hpp
++ Utilities/SundanceVersionString.hpp
++ Utilities/SundanceVertexSort.hpp
++ Utilities/SundanceWatchFlag.hpp
++ )
++
++APPEND_SET(SOURCES
++ Utilities/SundanceADReal.cpp
++ Utilities/SundanceCollectiveExceptionCheck.cpp
++ Utilities/SundanceCombinatorialUtils.cpp
++ Utilities/SundanceFunctorDomain.cpp
++ Utilities/SundanceIntHashSet.cpp
++ Utilities/SundanceIntVec.cpp
++ Utilities/SundanceParamUtils.cpp
++ Utilities/SundancePathUtils.cpp
++ Utilities/SundancePoint.cpp
++ Utilities/SundanceStdMathFunctors.cpp
++ Utilities/SundanceUnaryFunctor.cpp
++ Utilities/SundanceVertexSort.cpp
++ Utilities/SundanceWatchFlag.cpp
++ )
++
++
++IF (TPL_ENABLE_MPI)
++ENDIF()
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ sundanceUtils
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ DEPLIBS playa
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/teko/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/teko/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/teko/src/CMakeLists.txt 2012-01-09 18:04:07.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/teko/src/CMakeLists.txt 2012-02-06 14:37:24.399035506 +0100
+@@ -59,7 +59,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- teko
++ trilinos_teko
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/teuchos/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/teuchos/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/teuchos/src/CMakeLists.txt 2012-01-09 18:04:19.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/teuchos/src/CMakeLists.txt 2012-02-06 13:03:19.279235176 +0100
@@ -363,7 +363,7 @@
ENDIF()
@@ -2913,10 +10765,407 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
DEFINES -DTEUCHOS_LIB_EXPORTS_MODE
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/teuchos/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/teuchos/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/teuchos/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/teuchos/src/CMakeLists.txt.orig 2012-02-06 12:48:01.843267626 +0100
+@@ -0,0 +1,370 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++SET(CURRENT_PACKAGE TEUCHOS)
++CONFIGURE_FILE("${TRILINOS_HOME_DIR}/packages/Trilinos_DLLExportMacro.h.in"
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_DLLExportMacro.h)
++
++#
++# B) Define the header and source files (and include directories)
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++# Set the base Trilinos directory in order to find Trilinos_version.h
++
++ASSERT_DEFINED(PROJECT_SOURCE_DIR)
++
++INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR})
++
++APPEND_SET(HEADERS
++ ${CMAKE_CURRENT_BINARY_DIR}/../../../Trilinos_version.h
++ )
++
++# Set headers (for IDEs and installing)
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++APPEND_SET(HEADERS
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_DLLExportMacro.h
++ )
++
++# NOTE: Above, we add the XXX_config.h file so tht MS Visual Studio
++# will know to include this file in the dependency analysis
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++APPEND_SET(HEADERS
++ Teuchos_AbstractFactory.hpp
++ Teuchos_AbstractFactoryStd.hpp
++ Teuchos_Array.hpp
++ Teuchos_ArrayRCP.hpp
++ Teuchos_ArrayRCPDecl.hpp
++ Teuchos_ArrayView.hpp
++ Teuchos_ArrayViewDecl.hpp
++ Teuchos_ArrayConversions.hpp
++ Teuchos_Assert.hpp
++ Teuchos_BLAS.hpp
++ Teuchos_BLAS_types.hpp
++ Teuchos_BLAS_wrappers.hpp
++ Teuchos_CTimeMonitor.h
++ Teuchos_Comm.hpp
++ Teuchos_CommHelpers.hpp
++ Teuchos_CommUtilities.hpp
++ Teuchos_CommandLineProcessor.hpp
++ Teuchos_CompObject.hpp
++ Teuchos_CompileTimeAssert.hpp
++ Teuchos_Condition.hpp
++ Teuchos_ConfigDefs.hpp
++ Teuchos_ConstNonconstObjectContainer.hpp
++ Teuchos_ConstTypeTraits.hpp
++ Teuchos_DataAccess.hpp
++ Teuchos_DebugDefaultAsserts.hpp
++ Teuchos_DefaultComm.hpp
++ Teuchos_DefaultSerialComm.hpp
++ Teuchos_Dependency.hpp
++ Teuchos_DependencySheet.hpp
++ Teuchos_Describable.hpp
++ Teuchos_DummyObjectGetter.hpp
++ Teuchos_ENull.hpp
++ Teuchos_ErrorPolling.hpp
++ Teuchos_Exceptions.hpp
++ Teuchos_ExpandScalarTypeMacros.hpp
++ Teuchos_ExplicitInstantiationHelpers.hpp
++ Teuchos_F77_wrappers.h
++ Teuchos_FancyOStream.hpp
++ Teuchos_Flops.hpp
++ Teuchos_FunctionObject.hpp
++ Teuchos_GlobalMPISession.hpp
++ Teuchos_Handle.hpp
++ Teuchos_Handleable.hpp
++ Teuchos_InvalidConditionException.hpp
++ Teuchos_InvalidDependencyException.hpp
++ Teuchos_LAPACK.hpp
++ Teuchos_LAPACK_wrappers.hpp
++ Teuchos_LabeledObject.hpp
++ Teuchos_LocalTestingHelpers.hpp
++ Teuchos_MPIComm.hpp
++ Teuchos_MPISession.hpp
++ Teuchos_MPITraits.hpp
++ Teuchos_NullIteratorTraits.hpp
++ Teuchos_Object.hpp
++ Teuchos_ObjectBuilder.hpp
++ Teuchos_OpaqueWrapper.hpp
++ Teuchos_OrdinalTraits.hpp
++ Teuchos_ParameterEntry.hpp
++ Teuchos_ParameterEntryValidator.hpp
++ Teuchos_ParameterList.hpp
++ Teuchos_ParameterListAcceptor.hpp
++ Teuchos_ParameterListAcceptorDefaultBase.hpp
++ Teuchos_ParameterListAcceptorHelpers.hpp
++ Teuchos_ParameterListExceptions.hpp
++ Teuchos_ParameterListNonAcceptor.hpp
++ Teuchos_PerformanceMonitorBase.hpp
++ Teuchos_Polynomial.hpp
++ Teuchos_PolynomialDecl.hpp
++ Teuchos_PolynomialTraits.hpp
++ Teuchos_PromotionTraits.hpp
++ Teuchos_Ptr.hpp
++ Teuchos_PtrDecl.hpp
++ Teuchos_RCP.hpp
++ Teuchos_RCPDecl.hpp
++ Teuchos_RCPNode.hpp
++ Teuchos_Range1D.hpp
++ Teuchos_RawMPITraits.hpp
++ Teuchos_ReductionOp.hpp
++ Teuchos_ReductionOp.hpp
++ Teuchos_ReductionOpHelpers.hpp
++ Teuchos_RefCountPtr.hpp
++ Teuchos_RefCountPtrDecl.hpp
++ Teuchos_ScalarTraits.hpp
++ Teuchos_ScalarTraitsCUDA.hpp
++ Teuchos_ScalarTraitsDecl.hpp
++ Teuchos_SerialDenseHelpers.hpp
++ Teuchos_SerialDenseMatrix.hpp
++ Teuchos_SerialDenseSolver.hpp
++ Teuchos_SerialDenseVector.hpp
++ Teuchos_SerialSpdDenseSolver.hpp
++ Teuchos_SerialSymDenseMatrix.hpp
++ Teuchos_SerializationTraits.hpp
++ Teuchos_SerializationTraitsHelpers.hpp
++ Teuchos_Serializer.hpp
++ Teuchos_SerializerHelpers.hpp
++ Teuchos_SimpleObjectTable.hpp
++ Teuchos_StandardCatchMacros.hpp
++ Teuchos_StandardCompositionMacros.hpp
++ Teuchos_StandardConditions.hpp
++ Teuchos_StandardDependencies.hpp
++ Teuchos_StandardFunctionObjects.hpp
++ Teuchos_StandardMemberCompositionMacros.hpp
++ Teuchos_StandardParameterEntryValidators.hpp
++ Teuchos_StaticSetupMacro.hpp
++ Teuchos_StringToIntMap.hpp
++ Teuchos_TableColumn.hpp
++ Teuchos_TableEntry.hpp
++ Teuchos_TableFormat.hpp
++ Teuchos_TabularOutputter.hpp
++ Teuchos_TestForException.hpp
++ Teuchos_TestingHelpers.hpp
++ Teuchos_Time.hpp
++ Teuchos_TimeMonitor.hpp
++ Teuchos_Tuple.hpp
++ Teuchos_TypeNameTraits.hpp
++ Teuchos_TypeTraits.hpp
++ Teuchos_TwoDArray.hpp
++ Teuchos_UnitTestBase.hpp
++ Teuchos_UnitTestHarness.hpp
++ Teuchos_UnitTestHelpers.hpp
++ Teuchos_UnitTestRepository.hpp
++ Teuchos_Utils.hpp
++ Teuchos_ValidatorFactory.hpp
++ Teuchos_VerboseObject.hpp
++ Teuchos_VerboseObjectParameterListHelpers.hpp
++ Teuchos_VerbosityLevel.hpp
++ Teuchos_VerbosityLevelCommandLineProcessorHelpers.hpp
++ Teuchos_Version.hpp
++ Teuchos_Workspace.hpp
++ Teuchos_any.hpp
++ Teuchos_arrayArg.hpp
++ Teuchos_as.hpp
++ Teuchos_basic_oblackholestream.hpp
++ Teuchos_dyn_cast.hpp
++ Teuchos_getBaseObjVoidPtr.hpp
++ Teuchos_getConst.hpp
++ Teuchos_getRawPtr.hpp
++ Teuchos_implicit_cast.hpp
++ Teuchos_map.hpp
++ Teuchos_oblackholestream.hpp
++ Teuchos_stacktrace.hpp
++ Teuchos_toString.hpp
++ Teuchos_iostream_helpers.hpp
++ )
++
++# Set sources
++
++APPEND_SET(SOURCES
++ Teuchos_BLAS.cpp
++ Teuchos_CTimeMonitor.cpp
++ Teuchos_CommandLineProcessor.cpp
++ Teuchos_CompObject.cpp
++ Teuchos_Describable.cpp
++ Teuchos_Dependency.cpp
++ Teuchos_DependencySheet.cpp
++ Teuchos_ErrorPolling.cpp
++ Teuchos_Flops.cpp
++ Teuchos_GlobalMPISession.cpp
++ Teuchos_LAPACK.cpp
++ Teuchos_LabeledObject.cpp
++ Teuchos_MPIComm.cpp
++ Teuchos_MPISession.cpp
++ Teuchos_Object.cpp
++ Teuchos_ParameterEntry.cpp
++ Teuchos_ParameterList.cpp
++ Teuchos_ParameterListAcceptorHelpers.cpp
++ Teuchos_ParameterListAcceptor.cpp
++ Teuchos_ParameterListAcceptorDefaultBase.cpp
++ Teuchos_ParameterListNonAcceptor.cpp
++ Teuchos_PerformanceMonitorBase.cpp
++ Teuchos_Ptr.cpp
++ Teuchos_RCPNode.cpp
++ Teuchos_Range1D.cpp
++ Teuchos_ScalarTraits.cpp
++ Teuchos_StandardConditions.cpp
++ Teuchos_StandardDependencies.cpp
++ Teuchos_StandardParameterEntryValidators.cpp
++ Teuchos_StringToIntMap.cpp
++ Teuchos_TableColumn.cpp
++ Teuchos_TableEntry.cpp
++ Teuchos_TableFormat.cpp
++ Teuchos_TabularOutputter.cpp
++ Teuchos_TestForException.cpp
++ Teuchos_TestingHelpers.cpp
++ Teuchos_Time.cpp
++ Teuchos_TimeMonitor.cpp
++ Teuchos_TypeNameTraits.cpp
++ Teuchos_UnitTestBase.cpp
++ Teuchos_UnitTestRepository.cpp
++ Teuchos_Utils.cpp
++ Teuchos_ValidatorFactory.cpp
++ Teuchos_VerboseObject.cpp
++ Teuchos_VerboseObjectParameterListHelpers.cpp
++ Teuchos_VerbosityLevel.cpp
++ Teuchos_VerbosityLevelCommandLineProcessorHelpers.cpp
++ Teuchos_Workspace.cpp
++ Teuchos_dyn_cast.cpp
++ Teuchos_stacktrace.cpp
++ )
++
++# Set addition headers and source based on package-specific
++# configuration options
++
++IF(${PACKAGE_NAME}_ENABLE_EXTENDED)
++APPEND_SET(HEADERS
++ Teuchos_ConditionXMLConverter.hpp
++ Teuchos_ConditionXMLConverterDB.hpp
++ Teuchos_DependencyXMLConverter.hpp
++ Teuchos_DependencyXMLConverterDB.hpp
++ Teuchos_ExpatHandlerAdapter.hpp
++ Teuchos_FileInputSource.hpp
++ Teuchos_FileInputStream.hpp
++ Teuchos_FunctionObjectXMLConverter.hpp
++ Teuchos_FunctionObjectXMLConverterDB.hpp
++ Teuchos_HashSet.hpp
++ Teuchos_Hashtable.hpp
++ Teuchos_HashUtils.hpp
++ Teuchos_Libxml2HandlerAdapter.hpp
++ Teuchos_ParameterXMLFileReader.hpp
++ Teuchos_ParameterEntryXMLConverter.hpp
++ Teuchos_ParameterEntryXMLConverterDB.hpp
++ Teuchos_StandardConditionXMLConverters.hpp
++ Teuchos_StandardDependencyXMLConverters.hpp
++ Teuchos_StandardFunctionObjectXMLConverters.hpp
++ Teuchos_StandardParameterEntryXMLConverters.hpp
++ Teuchos_StandardValidatorXMLConverters.hpp
++ Teuchos_StringInputSource.hpp
++ Teuchos_StringInputStream.hpp
++ Teuchos_StrUtils.hpp
++ Teuchos_TreeBuildingXMLHandler.hpp
++ Teuchos_ValidatorMaps.hpp
++ Teuchos_ValidatorXMLConverter.hpp
++ Teuchos_ValidatorXMLConverterDB.hpp
++ Teuchos_XMLConditionExceptions.hpp
++ Teuchos_XMLDependencyExceptions.hpp
++ Teuchos_XMLFunctionObjectExceptions.hpp
++ Teuchos_XMLInputSource.hpp
++ Teuchos_XMLInputStream.hpp
++ Teuchos_XMLObject.hpp
++ Teuchos_XMLObjectImplem.hpp
++ Teuchos_XMLParameterListExceptions.hpp
++ Teuchos_XMLParameterListHelpers.hpp
++ Teuchos_XMLParameterListReader.hpp
++ Teuchos_XMLParameterListWriter.hpp
++ Teuchos_XMLParser.hpp
++ )
++
++ APPEND_SET(SOURCES
++ Teuchos_ConditionXMLConverter.cpp
++ Teuchos_ConditionXMLConverterDB.cpp
++ Teuchos_DependencyXMLConverter.cpp
++ Teuchos_DependencyXMLConverterDB.cpp
++ Teuchos_ExpatHandlerAdapter.cpp
++ Teuchos_FileInputSource.cpp
++ Teuchos_FileInputStream.cpp
++ Teuchos_FunctionObjectXMLConverter.cpp
++ Teuchos_FunctionObjectXMLConverterDB.cpp
++ Teuchos_HashUtils.cpp
++ Teuchos_Libxml2HandlerAdapter.cpp
++ Teuchos_ParameterXMLFileReader.cpp
++ Teuchos_ParameterEntryXMLConverter.cpp
++ Teuchos_ParameterEntryXMLConverterDB.cpp
++ Teuchos_StandardDependencyXMLConverters.cpp
++ Teuchos_StandardParameterEntryXMLConverters.cpp
++ Teuchos_StandardValidatorXMLConverters.cpp
++ Teuchos_StandardConditionXMLConverters.cpp
++ Teuchos_StrUtils.cpp
++ Teuchos_StringInputSource.cpp
++ Teuchos_StringInputStream.cpp
++ Teuchos_TreeBuildingXMLHandler.cpp
++ Teuchos_ValidatorMaps.cpp
++ Teuchos_ValidatorXMLConverter.cpp
++ Teuchos_ValidatorXMLConverterDB.cpp
++ Teuchos_XMLInputSource.cpp
++ Teuchos_XMLInputStream.cpp
++ Teuchos_XMLObject.cpp
++ Teuchos_XMLObjectImplem.cpp
++ Teuchos_XMLParameterListHelpers.cpp
++ Teuchos_XMLParameterListReader.cpp
++ Teuchos_XMLParameterListWriter.cpp
++ Teuchos_XMLParser.cpp
++ )
++
++ENDIF()
++
++IF (${PACKAGE_NAME}_ENABLE_MPI)
++
++ APPEND_SET(HEADERS
++ Teuchos_DefaultMpiComm.hpp
++ Teuchos_MpiReductionOpSetter.hpp
++ )
++
++ APPEND_SET(SOURCES
++ Teuchos_MpiReductionOpSetter.cpp
++ )
++
++ENDIF()
++
++IF (${PACKAGE_NAME}_ENABLE_Boost)
++
++ APPEND_SET(HEADERS
++ Teuchos_RCPBoostSharedPtrConversions.hpp
++ Teuchos_RCPBoostSharedPtrConversionsDecl.hpp
++ )
++
++ENDIF()
++
++#
++# C) Define the targets for package's library(s)
++#
++
++IF (CMAKE_CXX_COMPILER_ID STREQUAL GNU)
++ # Must suppress strick aliasing warnings for this file!
++ SET_SOURCE_FILES_PROPERTIES(
++ Teuchos_stacktrace.cpp
++ PROPERTIES COMPILE_FLAGS -fno-strict-aliasing
++ )
++ENDIF()
++
++PACKAGE_ADD_LIBRARY(
++ teuchos
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ DEFINES -DTEUCHOS_LIB_EXPORTS_MODE
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/teuchos/test/Conditions/CMakeLists.txt trilinos-10.8.5.dfsg/packages/teuchos/test/Conditions/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/teuchos/test/Conditions/CMakeLists.txt 2012-01-09 18:04:20.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/teuchos/test/Conditions/CMakeLists.txt 2012-02-06 15:31:34.470920553 +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
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/teuchos/test/Dependencies/CMakeLists.txt trilinos-10.8.5.dfsg/packages/teuchos/test/Dependencies/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/teuchos/test/Dependencies/CMakeLists.txt 2012-01-09 18:04:20.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/teuchos/test/Dependencies/CMakeLists.txt 2012-02-06 15:31:48.422920058 +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
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/teuchos/test/FancyOutputting/CMakeLists.txt trilinos-10.8.5.dfsg/packages/teuchos/test/FancyOutputting/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/teuchos/test/FancyOutputting/CMakeLists.txt 2012-01-09 18:04:19.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/teuchos/test/FancyOutputting/CMakeLists.txt 2012-02-06 13:03:19.279235176 +0100
@@ -2,17 +2,17 @@
INCLUDE(PackageAddExecutableAndTest)
@@ -2938,10 +11187,47 @@
COMM serial mpi
STANDARD_PASS_OUTPUT
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/teuchos/test/ParameterList/CMakeLists.txt trilinos-10.8.5.dfsg/packages/teuchos/test/ParameterList/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/teuchos/test/ParameterList/CMakeLists.txt 2012-01-09 18:04:20.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/teuchos/test/ParameterList/CMakeLists.txt 2012-02-06 14:45:25.851018478 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/teuchos/test/Validators/CMakeLists.txt trilinos-10.8.5.dfsg/packages/teuchos/test/Validators/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/teuchos/test/Validators/CMakeLists.txt 2012-01-09 18:04:20.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/teuchos/test/Validators/CMakeLists.txt 2012-02-06 15:31:53.638919874 +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
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/ThreadPool/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/ThreadPool/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/ThreadPool/src/CMakeLists.txt 2012-01-09 18:05:28.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/ThreadPool/src/CMakeLists.txt 2012-02-06 13:03:19.279235176 +0100
@@ -64,7 +64,7 @@
#
@@ -2951,10 +11237,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/thyra/adapters/epetra/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/thyra/adapters/epetra/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/thyra/adapters/epetra/src/CMakeLists.txt 2012-01-09 18:04:17.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/thyra/adapters/epetra/src/CMakeLists.txt 2012-02-06 14:46:36.475015981 +0100
@@ -10,7 +10,7 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
@@ -2964,10 +11249,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/thyra/adapters/epetraext/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/thyra/adapters/epetraext/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/thyra/adapters/epetraext/src/CMakeLists.txt 2012-01-09 18:04:17.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/thyra/adapters/epetraext/src/CMakeLists.txt 2012-02-06 14:46:32.331016126 +0100
@@ -13,7 +13,7 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
@@ -2977,10 +11261,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/thyra/adapters/tpetra/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/thyra/adapters/tpetra/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/thyra/adapters/tpetra/src/CMakeLists.txt 2012-01-09 18:04:17.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/thyra/adapters/tpetra/src/CMakeLists.txt 2012-02-06 14:46:28.475016263 +0100
@@ -11,7 +11,7 @@
@@ -2990,10 +11273,58 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/thyra/core/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/thyra/core/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/thyra/core/src/CMakeLists.txt 2012-01-09 18:04:17.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/thyra/core/src/CMakeLists.txt 2012-02-06 14:46:06.155017050 +0100
+@@ -86,7 +86,7 @@
+ #
+
+ PACKAGE_ADD_LIBRARY(
+- thyracore
++ trilinos_thyracore
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/thyra/core/test/nonlinear/models/CMakeLists.txt trilinos-10.8.5.dfsg/packages/thyra/core/test/nonlinear/models/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/thyra/core/test/nonlinear/models/CMakeLists.txt 2012-01-09 18:04:17.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/thyra/core/test/nonlinear/models/CMakeLists.txt 2012-02-06 14:46:24.379016407 +0100
+@@ -15,10 +15,10 @@
+ APPEND_GLOB(HEADERS ${DIR}/*.hpp)
+
+ PACKAGE_ADD_LIBRARY(
+- thyra_nonlinear_test_models
++ trilinos_thyra_nonlinear_test_models
+ HEADERS ${HEADERS}
+ SOURCES ${SOURCES}
+- DEPLIBS thyracore
++ DEPLIBS trilinos_thyracore
+ TESTONLY
+ )
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/thyra/core/test/nonlinear/models/UnitTests/CMakeLists.txt trilinos-10.8.5.dfsg/packages/thyra/core/test/nonlinear/models/UnitTests/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/thyra/core/test/nonlinear/models/UnitTests/CMakeLists.txt 2012-01-09 18:04:17.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/thyra/core/test/nonlinear/models/UnitTests/CMakeLists.txt 2012-02-06 15:32:18.694918985 +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
+ )
+@@ -17,7 +17,7 @@
+ SOURCES
+ DiagonalQuadraticResponseOnlyModelEvaluator_UnitTests.cpp
+ ${TEUCHOS_STD_UNIT_TEST_MAIN}
+- DEPLIBS thyra_nonlinear_test_models
++ DEPLIBS trilinos_thyra_nonlinear_test_models
+ COMM serial mpi
+ )
+
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/thyra/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/thyra/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/thyra/src/CMakeLists.txt 2012-01-09 18:04:17.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/thyra/src/CMakeLists.txt 2012-02-06 13:03:19.279235176 +0100
@@ -9,7 +9,7 @@
APPEND_GLOB(SOURCES ${DIR}/*.cpp)
@@ -3003,10 +11334,66 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/thyra/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/thyra/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/thyra/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/thyra/src/CMakeLists.txt.orig 2012-02-06 12:48:01.779267628 +0100
+@@ -0,0 +1,15 @@
++
++INCLUDE(PackageLibraryMacros)
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++SET_AND_INC_DIRS(DIR ${CMAKE_CURRENT_SOURCE_DIR})
++APPEND_GLOB(HEADERS ${DIR}/*.hpp)
++APPEND_GLOB(SOURCES ${DIR}/*.cpp)
++
++PACKAGE_ADD_LIBRARY(
++ thyra
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/example/HybridPlatform/CMakeLists.txt trilinos-10.8.5.dfsg/packages/tpetra/example/HybridPlatform/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/example/HybridPlatform/CMakeLists.txt 2012-01-09 18:06:44.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/example/HybridPlatform/CMakeLists.txt 2012-02-06 15:18:21.482948600 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/example/LocalMatOps/CMakeLists.txt trilinos-10.8.5.dfsg/packages/tpetra/example/LocalMatOps/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/example/LocalMatOps/CMakeLists.txt 2012-01-09 18:06:44.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/example/LocalMatOps/CMakeLists.txt 2012-02-06 15:17:47.710949796 +0100
+@@ -17,5 +17,5 @@
+ # ARGS
+ COMM mpi serial
+ STANDARD_PASS_OUTPUT
+- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/ext/CMakeLists.txt trilinos-10.8.5.dfsg/packages/tpetra/ext/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/ext/CMakeLists.txt 2012-01-09 18:06:42.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/ext/CMakeLists.txt 2012-02-06 14:19:55.559072604 +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)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/inout/CMakeLists.txt trilinos-10.8.5.dfsg/packages/tpetra/inout/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/inout/CMakeLists.txt 2012-01-09 18:06:44.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/inout/CMakeLists.txt 2012-02-06 13:03:19.279235176 +0100
@@ -41,10 +41,10 @@
#
@@ -3020,10 +11407,25 @@
)
# PACKAGE_ADD_TEST_DIRECTORIES(test)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/rti/CMakeLists.txt trilinos-10.8.5.dfsg/packages/tpetra/rti/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/rti/CMakeLists.txt 2012-01-09 18:06:45.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/rti/CMakeLists.txt 2012-02-06 14:20:01.827072383 +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)
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/tpetra/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/src/CMakeLists.txt 2012-01-09 18:06:44.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/src/CMakeLists.txt 2012-02-06 13:03:19.279235176 +0100
@@ -33,7 +33,7 @@
#
@@ -3033,10 +11435,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/test/BlockMultiVector/CMakeLists.txt trilinos-10.8.5.dfsg/packages/tpetra/test/BlockMultiVector/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/test/BlockMultiVector/CMakeLists.txt 2012-01-09 18:06:44.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/test/BlockMultiVector/CMakeLists.txt 2012-02-06 13:03:19.279235176 +0100
@@ -9,5 +9,5 @@
${TEUCHOS_STD_UNIT_TEST_MAIN}
COMM serial mpi
@@ -3044,10 +11445,26 @@
- DEPLIBS kokkos kokkoslinalg kokkosnodeapi
+ DEPLIBS trilinos_kokkos trilinos_kokkoslinalg trilinos_kokkosnodeapi
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/test/BlockMultiVector/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/tpetra/test/BlockMultiVector/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/test/BlockMultiVector/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/test/BlockMultiVector/CMakeLists.txt.orig 2012-02-06 12:48:02.067267618 +0100
+@@ -0,0 +1,13 @@
++
++INCLUDE(PackageAddExecutableAndTest)
++
++
++PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ BlockMultiVector_UnitTests
++ SOURCES
++ BlockMultiVector_UnitTests
++ ${TEUCHOS_STD_UNIT_TEST_MAIN}
++ COMM serial mpi
++ STANDARD_PASS_OUTPUT
++ DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/test/CMakeLists.txt trilinos-10.8.5.dfsg/packages/tpetra/test/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/test/CMakeLists.txt 2012-01-09 18:06:45.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/test/CMakeLists.txt 2012-02-06 13:03:19.279235176 +0100
@@ -27,9 +27,9 @@
ENDIF()
@@ -3060,10 +11477,52 @@
TESTONLY
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/test/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/tpetra/test/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/test/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/test/CMakeLists.txt.orig 2012-02-06 12:48:02.071267618 +0100
+@@ -0,0 +1,39 @@
++INCLUDE(AddSubdirectories)
++
++ADD_SUBDIRECTORIES(
++ Platform
++ Map
++ Distributor
++ Directory
++ ImportExport
++ ImportExport2
++ MultiVector
++ BasicPerfTest
++ Utils
++ CrsGraph
++ CrsMatrix
++ BlockCrsGraph
++ BlockMap
++ BlockMultiVector
++ VbrMatrix
++ RowMatrixTransposer
++ MatrixMatrix
++ TypeStack
++ inout
++ )
++
++IF (Tpetra_ENABLE_BUGTESTS)
++ ADD_SUBDIRECTORY(BugTests)
++ENDIF()
++
++PACKAGE_ADD_LIBRARY(
++ tpetratestlib
++ SOURCES UnitTestMissingExplicitInstantiations.cpp
++ DEPLIBS tpetra teuchos
++ TESTONLY
++)
++
++
++IF (Tpetra_ENABLE_Epetra)
++ ADD_SUBDIRECTORY(EpetraRowMatrix)
++ENDIF()
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/test/CrsMatrix/CMakeLists.txt trilinos-10.8.5.dfsg/packages/tpetra/test/CrsMatrix/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/test/CrsMatrix/CMakeLists.txt 2012-01-09 18:06:45.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/test/CrsMatrix/CMakeLists.txt 2012-02-06 15:12:35.054960853 +0100
@@ -17,7 +17,7 @@
ARGS ${ARGS}
COMM serial mpi
@@ -3109,10 +11568,40 @@
)
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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/test/inout/CMakeLists.txt trilinos-10.8.5.dfsg/packages/tpetra/test/inout/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/test/inout/CMakeLists.txt 2012-01-09 18:06:45.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/test/inout/CMakeLists.txt 2012-02-06 15:14:45.694956231 +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
+ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/test/MatrixMatrix/CMakeLists.txt trilinos-10.8.5.dfsg/packages/tpetra/test/MatrixMatrix/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/test/MatrixMatrix/CMakeLists.txt 2012-01-09 18:06:45.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/test/MatrixMatrix/CMakeLists.txt 2012-02-06 15:13:00.126959967 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/test/MultiVector/CMakeLists.txt trilinos-10.8.5.dfsg/packages/tpetra/test/MultiVector/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/test/MultiVector/CMakeLists.txt 2012-01-09 18:06:45.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/test/MultiVector/CMakeLists.txt 2012-02-06 15:17:32.270950340 +0100
@@ -9,7 +9,7 @@
${TEUCHOS_STD_UNIT_TEST_MAIN}
COMM serial mpi
@@ -3149,10 +11638,73 @@
)
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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/test/MultiVector/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/tpetra/test/MultiVector/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/test/MultiVector/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/test/MultiVector/CMakeLists.txt.orig 2012-02-06 12:48:02.067267618 +0100
+@@ -0,0 +1,48 @@
++INCLUDE(PackageAddExecutableAndTest)
++INCLUDE(PackageAddExecutable)
++
++
++PACKAGE_ADD_EXECUTABLE_AND_TEST(
++ MultiVector_UnitTests
++ SOURCES
++ MultiVector_UnitTests
++ ${TEUCHOS_STD_UNIT_TEST_MAIN}
++ COMM serial mpi
++ STANDARD_PASS_OUTPUT
++ DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ )
++
++SET(TIMING_INSTALLS "")
++
++IF (Kokkos_ENABLE_TBB AND Tpetra_ENABLE_MPI)
++ PACKAGE_ADD_EXECUTABLE(
++ GEMMTiming_TBB
++ SOURCES GEMMTiming_TBB
++ COMM mpi
++ DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ )
++ APPEND_SET(TIMING_INSTALLS Tpetra_GEMMTiming_TBB)
++ENDIF()
++
++IF (Kokkos_ENABLE_ThreadPool AND Tpetra_ENABLE_MPI)
++ PACKAGE_ADD_EXECUTABLE(
++ GEMMTiming_TPI
++ SOURCES GEMMTiming_TPI
++ COMM mpi
++ DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ )
++ APPEND_SET(TIMING_INSTALLS Tpetra_GEMMTiming_TPI)
++ENDIF()
++
++IF (Kokkos_ENABLE_Thrust AND Kokkos_ENABLE_CUDA_DOUBLE AND Tpetra_ENABLE_MPI)
++ PACKAGE_ADD_EXECUTABLE(
++ GEMMTiming_Thrust
++ SOURCES GEMMTiming_Thrust
++ COMM mpi
++ DEPLIBS kokkos kokkoslinalg kokkosnodeapi
++ )
++ APPEND_SET(TIMING_INSTALLS Tpetra_GEMMTiming_Thrust)
++ENDIF()
++
++INSTALL(TARGETS ${TIMING_INSTALLS}
++ RUNTIME DESTINATION "${${PROJECT_NAME}_INSTALL_RUNTIME_DIR}")
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/test/RowMatrixTransposer/CMakeLists.txt trilinos-10.8.5.dfsg/packages/tpetra/test/RowMatrixTransposer/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/test/RowMatrixTransposer/CMakeLists.txt 2012-01-09 18:06:44.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/test/RowMatrixTransposer/CMakeLists.txt 2012-02-06 15:12:53.422960204 +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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/tpetra/test/VbrMatrix/CMakeLists.txt trilinos-10.8.5.dfsg/packages/tpetra/test/VbrMatrix/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/tpetra/test/VbrMatrix/CMakeLists.txt 2012-01-09 18:06:45.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/tpetra/test/VbrMatrix/CMakeLists.txt 2012-02-06 15:13:12.030959545 +0100
@@ -14,7 +14,7 @@
SOURCES
VbrMatrix_UnitTests
@@ -3162,10 +11714,9 @@
)
PACKAGE_ADD_TEST(
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/TriKota/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/TriKota/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/TriKota/src/CMakeLists.txt 2012-01-09 18:04:01.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/TriKota/src/CMakeLists.txt 2012-02-06 15:50:42.542879944 +0100
@@ -206,7 +206,7 @@
# TriKotaConfig.cmake and Makefile.export.TriKota. There should be a better
# way of doing this...
@@ -3184,10 +11735,9 @@
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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/trilinoscouplings/examples/scaling/CMakeLists.txt trilinos-10.8.5.dfsg/packages/trilinoscouplings/examples/scaling/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/trilinoscouplings/examples/scaling/CMakeLists.txt 2012-01-09 18:07:59.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/trilinoscouplings/examples/scaling/CMakeLists.txt 2012-02-06 15:28:57.450926105 +0100
@@ -8,28 +8,28 @@
PACKAGE_ADD_EXECUTABLE_AND_TEST(
Example_Poisson
@@ -3217,7 +11767,7 @@
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
++ DEPLIBS trilinos_epetra trilinos_epetraext trilinos_pamgen trilinos_aztecoo trilinos_amesos trilinos_ml
NUM_MPI_PROCS 1
ADD_DIR_TO_NAME
)
@@ -3226,14 +11776,13 @@
Example_Poisson_STK
SOURCES example_Poisson_stk.cpp
- DEPLIBS epetra epetraext aztecoo amesos ml
-+ DEPLIBS trilinos_epetra trilinos_epetraext trilinos_aztecoo trilinos_amesos ml
++ DEPLIBS trilinos_epetra trilinos_epetraext trilinos_aztecoo trilinos_amesos trilinos_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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/trilinoscouplings/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/trilinoscouplings/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/trilinoscouplings/src/CMakeLists.txt 2012-01-09 18:07:59.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/trilinoscouplings/src/CMakeLists.txt 2012-02-06 13:03:19.279235176 +0100
@@ -155,7 +155,7 @@
#
@@ -3243,10 +11792,174 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/trilinoscouplings/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/trilinoscouplings/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/trilinoscouplings/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/trilinoscouplings/src/CMakeLists.txt.orig 2012-02-06 12:48:01.943267623 +0100
+@@ -0,0 +1,161 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++#setting up optional package defines since the default
++#names are not used
++
++IF(HAVE_TRILINOSCOUPLINGS_EPETRAEXT)
++ SET(HAVE_EPETRAEXT ON)
++ENDIF()
++
++IF(HAVE_TRILINOSCOUPLINGS_ML)
++ SET(HAVE_ML ON)
++ENDIF()
++
++IF(HAVE_TRILINOSCOUPLINGS_NOX)
++ SET(HAVE_NOX ON)
++ENDIF()
++
++IF(HAVE_TRILINOSCOUPLINGS_AMESOS)
++ SET(HAVE_AMESOS ON)
++ENDIF()
++
++IF(HAVE_TRILINOSCOUPLINGS_IFPACK)
++ SET(HAVE_IFPACK ON)
++ENDIF()
++
++IF(HAVE_TRILINOSCOUPLINGS_ISORROPIA)
++ SET(HAVE_ISORROPIA ON)
++ENDIF()
++
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(SOURCES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
++ )
++
++#
++# Core files
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
++
++APPEND_SET(HEADERS
++ TrilinosCouplings_ConfigDefs.h
++ TrilinosCouplings_Version.h
++ )
++
++APPEND_SET(SOURCES
++ dummy.cpp
++ )
++
++IF(HAVE_TRILINOSCOUPLINGS_ML)
++ #Have Nox and ML
++ IF(HAVE_TRILINOSCOUPLINGS_NOX)
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ml/NonlinML)
++ APPEND_SET(HEADERS
++ ml/NonlinML/nlnml_ConstrainedMultiLevelOperator.H
++ ml/NonlinML/nlnml_finelevelnoxinterface.H
++ ml/NonlinML/nlnml_coarselevelnoxinterface.H
++ ml/NonlinML/nlnml_preconditioner.H
++ ml/NonlinML/nlnml_preconditioner_utils.H
++ ml/NonlinML/nlnml_linearsystem.H
++ ml/NonlinML/nlnml_nonlinearlevel.H
++ ml/NonlinML/nlnml_prepostoperator.H
++ )
++
++ APPEND_SET(SOURCES
++ ml/NonlinML/nlnml_prepostoperator.cpp
++ ml/NonlinML/nlnml_ConstrainedMultiLevelOperator.cpp
++ ml/NonlinML/nlnml_linearsystem.cpp
++ ml/NonlinML/nlnml_nonlinearlevel.cpp
++ ml/NonlinML/nlnml_coarselevelnoxinterface.cpp
++ ml/NonlinML/nlnml_preconditioner1.cpp
++ ml/NonlinML/nlnml_preconditioner_utils.cpp
++ )
++ ENDIF()
++
++ #Have Ifpack and ML
++ IF(HAVE_TRILINOSCOUPLINGS_IFPACK)
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ifpack)
++ APPEND_SET(HEADERS
++ ifpack/Ifpack_ML.h
++ )
++
++ APPEND_SET(SOURCES
++ ifpack/Ifpack_ML.cpp
++ )
++ ENDIF()
++ENDIF()
++
++IF(HAVE_TRILINOSCOUPLINGS_EPETRAEXT)
++ #Hae Isorropia and Epetra ext
++ IF(HAVE_TRILINOSCOUPLINGS_ISORROPIA)
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetraext)
++ APPEND_SET(HEADERS
++ epetraext/EpetraExt_Isorropia_CrsGraph.h
++ )
++
++ APPEND_SET(SOURCES
++ epetraext/EpetraExt_Isorropia_CrsGraph.cpp
++ )
++ ENDIF()
++
++ #Have Amesos and Epetra ext
++ IF(HAVE_TRILINOSCOUPLINGS_AMESOS)
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetraext)
++ APPEND_SET(HEADERS
++ epetraext/EpetraExt_AmesosBTF_CrsGraph.h
++ epetraext/EpetraExt_AmesosBTF_CrsMatrix.h
++ epetraext/EpetraExt_AmesosAMDGlobal_CrsGraph.h
++ )
++
++ APPEND_SET(SOURCES
++ epetraext/EpetraExt_AmesosBTF_CrsGraph.cpp
++ epetraext/EpetraExt_AmesosBTF_CrsMatrix.cpp
++ epetraext/EpetraExt_AmesosAMDGlobal_CrsGraph.cpp
++ )
++ ENDIF()
++
++ #Have all three Epetra ext, Amesos and Isorropia
++ IF(HAVE_TRILINOSCOUPLINGS_AMESOS AND HAVE_TRILINOSCOUPLINGS_ISORROPIA)
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/epetraext)
++ APPEND_SET(HEADERS
++ epetraext/EpetraExt_AmesosBTFGlobal_LinearProblem.h
++ )
++
++ APPEND_SET(SOURCES
++ epetraext/EpetraExt_AmesosBTFGlobal_LinearProblem.cpp
++ )
++ ENDIF()
++ENDIF()
++
++IF (TPL_ENABLE_MPI)
++ENDIF()
++
++#
++# C) Define the targets for package's library(s)
++#
++
++PACKAGE_ADD_LIBRARY(
++ trilinoscouplings
++ HEADERS ${HEADERS}
++ SOURCES ${SOURCES}
++ )
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/triutils/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/triutils/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/triutils/src/CMakeLists.txt 2012-01-09 18:05:57.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/triutils/src/CMakeLists.txt 2012-02-06 13:03:19.279235176 +0100
@@ -78,7 +78,7 @@
#
@@ -3256,10 +11969,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt trilinos-10.8.5.dfsg/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt 2012-01-09 18:07:55.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/zoltan/siMPI/pyMPI/siMPI/CMakeLists.txt 2012-02-06 13:03:19.279235176 +0100
@@ -466,7 +466,7 @@
#
@@ -3269,10 +11981,9 @@
HEADERS ${HEADERS}
SOURCES ${SOURCES}
)
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/zoltan/src/CMakeLists.txt trilinos-10.8.5.dfsg/packages/zoltan/src/CMakeLists.txt
+--- trilinos-10.8.5.dfsg.orig/packages/zoltan/src/CMakeLists.txt 2012-01-09 18:07:28.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/zoltan/src/CMakeLists.txt 2012-02-06 13:03:19.279235176 +0100
@@ -771,11 +771,11 @@
#
@@ -3287,1091 +11998,793 @@
HEADERS ${HEADERS}
NOINSTALLHEADERS ${NOINSTALLHEADERS}
SOURCES ${SOURCES}
-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
+diff -Nru trilinos-10.8.5.dfsg.orig/packages/zoltan/src/CMakeLists.txt.orig trilinos-10.8.5.dfsg/packages/zoltan/src/CMakeLists.txt.orig
+--- trilinos-10.8.5.dfsg.orig/packages/zoltan/src/CMakeLists.txt.orig 1970-01-01 01:00:00.000000000 +0100
++++ trilinos-10.8.5.dfsg/packages/zoltan/src/CMakeLists.txt.orig 2012-02-06 12:48:01.831267627 +0100
+@@ -0,0 +1,786 @@
++
++INCLUDE(PackageLibraryMacros)
++
++#
++# A) Package-specific configuration options
++#
++
++ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_METIS)
++SET(HAVE_METIS ${${PACKAGE_NAME}_ENABLE_METIS})
++
++ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_ParMETIS)
++SET(HAVE_PARMETIS ${${PACKAGE_NAME}_ENABLE_ParMETIS})
++
++ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_PaToH)
++SET(HAVE_PATOH ${${PACKAGE_NAME}_ENABLE_PaToH})
++
++ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Scotch)
++SET(HAVE_SCOTCH ${${PACKAGE_NAME}_ENABLE_Scotch})
++
++ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Zlib)
++SET(HAVE_GZIP ${${PACKAGE_NAME}_ENABLE_Zlib})
++
++PACKAGE_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)
++
++#
++# B) Define the header and source files (and directories)
++#
++
++#
++# src
++#
++
++SET(HEADERS "")
++SET(NONINSTALLHEADERS "")
++SET(SOURCES "")
++SET(MODULES "")
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
++
++SET(HEADERS ${HEADERS}
++ ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h
++ )
++
++#
++# src/include
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
++
++APPEND_SET(HEADERS
++ include/lbi_const.h
++ include/zoltan_align.h
++ include/zoltan_cpp.h
++ include/zoltan.h
++ include/zoltan_types.h
++ include/zoltan_comm.h
++ include/zoltan_comm_cpp.h
++ include/zoltan_timer_cpp.h
++ include/zoltan_timer.h
++ include/zoltan_dd.h
++ include/zoltan_dd_cpp.h
++ include/zoltan_mem.h
++ include/zoltan_eval.h
++ )
++
++#
++# src/all
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/all)
++
++APPEND_SET(NOINSTALLHEADERS
++ all/all_allo_const.h
++ )
++
++APPEND_SET(SOURCES
++ all/all_allo.c
++ )
++
++#
++# src/ccolamd
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ccolamd)
++
++APPEND_SET(NOINSTALLHEADERS
++ ccolamd/zoltan_ccolamd.h
++ )
++
++APPEND_SET(SOURCES
++ ccolamd/ccolamd.c
++ )
++
++#
++# src/coloring
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/coloring)
++
++APPEND_SET(NOINSTALLHEADERS
++ coloring/coloring_const.h
++ coloring/coloring.h
++ coloring/g2l_hash.h
++ coloring/bucket.h
++ )
++
++APPEND_SET(SOURCES
++ coloring/coloring.c
++ coloring/color_test.c
++ coloring/g2l_hash.c
++ coloring/bucket.c
++ )
++
++#
++# src/graph
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/graph)
++
++APPEND_SET(NOINSTALLHEADERS
++ graph/graph.h
++ graph/graph_const.h
++ )
++
++APPEND_SET(SOURCES
++ graph/graph.c
++ )
++
++
++#
++# src/ha
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/ha)
++
++APPEND_SET(NOINSTALLHEADERS
++ ha/ha_const.h
++ ha/ha_drum.h
++ )
++
++APPEND_SET(SOURCES
++ ha/build_machine_desc.c
++ ha/divide_machine.c
++ ha/get_processor_name.c
++ ha/ha_drum.c
++ )
++
++#
++# src/hier
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/hier)
++
++APPEND_SET(NOINSTALLHEADERS
++ hier/hier.h
++ )
++
++APPEND_SET(SOURCES
++ hier/hier.c
++ hier/hier_free_struct.c
++ )
++
++#
++# src/hsfc
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/hsfc)
++
++APPEND_SET(NOINSTALLHEADERS
++ hsfc/hsfc.h
++ hsfc/hsfc_const.h
++ hsfc/hsfc_hilbert_const.h
++ )
++
++APPEND_SET(SOURCES
++ hsfc/hsfc_box_assign.c
++ hsfc/hsfc.c
++ hsfc/hsfc_hilbert.c
++ hsfc/hsfc_point_assign.c
++ )
++
++#
++# src/lb
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lb)
++
++APPEND_SET(NOINSTALLHEADERS
++ lb/lb_const.h
++ lb/lb_init_const.h
++ )
++
++APPEND_SET(SOURCES
++ lb/lb_balance.c
++ lb/lb_box_assign.c
++ lb/lb_copy.c
++ lb/lb_eval.c
++ lb/lb_free.c
++ lb/lb_init.c
++ lb/lb_invert.c
++ lb/lb_migrate.c
++ lb/lb_part2proc.c
++ lb/lb_point_assign.c
++ lb/lb_remap.c
++ lb/lb_set_fn.c
++ lb/lb_set_method.c
++ lb/lb_set_part_sizes.c
++ )
++
++#
++# src/matrix
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/matrix)
++
++APPEND_SET(NOINSTALLHEADERS
++ matrix/matrix.h
++ )
++
++APPEND_SET(SOURCES
++ matrix/matrix_build.c
++ matrix/matrix_distribute.c
++ matrix/matrix_operations.c
++ matrix/matrix_sym.c
++ matrix/matrix_utils.c
++ matrix/common_sort.c
++ )
++
++
++#
++# src/oct
++#
++
++IF (${PACKAGE_NAME}_ENABLE_OCT)
++
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/oct)
++
++ APPEND_SET(NOINSTALLHEADERS
++ oct/costs_const.h
++ oct/costs.h
++ oct/dfs_const.h
++ oct/dfs.h
++ oct/migoct_const.h
++ oct/migreg_const.h
++ oct/migreg.h
++ oct/migtags_const.h
++ oct/msg_const.h
++ oct/octant_const.h
++ oct/octree_const.h
++ oct/octupdate_const.h
++ oct/octupdate.h
++ oct/oct_util_const.h
++ oct/rootlist_const.h
++ oct/SFC.h
++ )
++
++ APPEND_SET(SOURCES
++ oct/costs.c
++ oct/dfs.c
++ oct/migoct.c
++ oct/migreg.c
++ oct/migtags.c
++ oct/msg.c
++ oct/octant.c
++ oct/oct_plot.c
++ oct/octree.c
++ oct/octupdate.c
++ oct/oct_util.c
++ oct/output.c
++ oct/rootlist.c
++ )
++
++ENDIF()
++
++#
++# src/order
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/order)
++
++APPEND_SET(NOINSTALLHEADERS
++ order/order_const.h
++ )
++
++APPEND_SET(SOURCES
++ order/hsfcOrder.c
++ order/order.c
++ order/order_struct.c
++ order/order_tools.c
++ order/perm.c
++ )
++
++IF (${PACKAGE_NAME}_ENABLE_HUND)
++ APPEND_SET(SOURCES
++ order/hund.c
++ )
++ENDIF()
++#
++# src/par
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/par)
++
++APPEND_SET(NOINSTALLHEADERS
++ par/par_average_const.h
++ par/par_bisect_const.h
++ par/par_const.h
++ par/par_median_const.h
++ par/par_tflops_special_const.h
++ )
++
++APPEND_SET(SOURCES
++ par/par_average.c
++ par/par_bisect.c
++ par/par_median.c
++ par/par_median_randomized.c
++ par/par_stats.c
++ par/par_sync.c
++ par/par_tflops_special.c
++ )
++
++#
++# src/params
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/params)
++
++APPEND_SET(NOINSTALLHEADERS
++ params/key_params.h
++ params/params_const.h
++ )
++
++APPEND_SET(SOURCES
++ params/assign_param_vals.c
++ params/bind_param.c
++ params/check_param.c
++ params/free_params.c
++ params/key_params.c
++ params/print_params.c
++ params/set_param.c
++ )
++
++
++
++#
++# src/tpls
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/tpls)
++
++APPEND_SET(NOINSTALLHEADERS
++ tpls/third_library_const.h
++ tpls/third_library.h
++ tpls/third_library_tools.h
++ tpls/graph_util.h
++ tpls/ccolamd_interface.h
++ )
++
++APPEND_SET(SOURCES
++ tpls/build_graph.c
++ tpls/postprocessing.c
++ tpls/preprocessing.c
++ tpls/scatter_graph.c
++ tpls/third_library.c
++ tpls/verify_graph.c
++ tpls/ccolamd_interface.c
++ )
++
++IF (${PACKAGE_NAME}_ENABLE_ParMETIS OR ${PACKAGE_NAME}_ENABLE_METIS)
++
++ APPEND_SET(NOINSTALLHEADERS
++ tpls/parmetis_interface.h
++ )
++
++ APPEND_SET(SOURCES
++ tpls/parmetis_interface.c
++ )
++
++ENDIF()
++
++IF (${PACKAGE_NAME}_ENABLE_Scotch)
++
++ APPEND_SET(NOINSTALLHEADERS
++ tpls/scotch_interface.h
++ )
++
++ APPEND_SET(SOURCES
++ tpls/scotch_interface.c
++ )
++
++ENDIF()
++
++
++#
++# src/phg
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/phg)
++
++APPEND_SET(NOINSTALLHEADERS
++ phg/phg_comm.h
++ phg/phg_const.h
++ phg/phg_distrib.h
++ phg/phg.h
++ phg/phg_lookup.h
++ phg/phg_verbose.h
++ phg/phg_hypergraph.h
++ phg/phg_tree.h
++ phg/phg_util.h
++ )
++
++APPEND_SET(SOURCES
++ phg/phg_build.c
++ phg/phg_build_calls.c
++ phg/phg.c
++ phg/phg_lookup.c
++ phg/phg_verbose.c
++ phg/phg_coarse.c
++ phg/phg_comm.c
++ phg/phg_distrib.c
++ phg/phg_gather.c
++ phg/phg_hypergraph.c
++ phg/phg_match.c
++ phg/phg_order.c
++ phg/phg_parkway.c
++ phg/phg_patoh.c
++ phg/phg_plot.c
++ phg/phg_rdivide.c
++ phg/phg_refinement.c
++ phg/phg_scale.c
++ phg/phg_serialpartition.c
++ phg/phg_tree.c
++ phg/phg_two_ways.c
++ phg/phg_util.c
++ phg/phg_Vcycle.c
++ )
++
++#
++# src/rcb
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/rcb)
++
++APPEND_SET(NOINSTALLHEADERS
++ rcb/create_proc_list_const.h
++ rcb/rcb_const.h
++ rcb/rcb.h
++ rcb/rib_const.h
++ rcb/rib.h
++ rcb/shared.h
++ )
++
++APPEND_SET(SOURCES
++ rcb/box_assign.c
++ rcb/create_proc_list.c
++ rcb/inertial1d.c
++ rcb/inertial2d.c
++ rcb/inertial3d.c
++ rcb/point_assign.c
++ rcb/rcb_box.c
++ rcb/rcb.c
++ rcb/rcb_util.c
++ rcb/rib.c
++ rcb/rib_util.c
++ rcb/shared.c
++ )
++
++#
++# src/reftree
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/reftree)
++
++APPEND_SET(NOINSTALLHEADERS
++ reftree/reftree_const.h
++ reftree/reftree.h
++ )
++
++APPEND_SET(SOURCES
++ reftree/reftree_build.c
++ reftree/reftree_coarse_path.c
++ reftree/reftree_hash.c
++ reftree/reftree_part.c
++ )
++
++#
++# src/simple
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/simple)
++
++APPEND_SET(SOURCES
++ simple/block.c
++ simple/cyclic.c
++ simple/random.c
++ )
++
++APPEND_SET(NOINSTALLHEADERS
++ simple/simple_const.h
++ )
++
++#
++# src/timer
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/timer)
++
++APPEND_SET(NOINSTALLHEADERS
++ timer/timer_const.h
++ )
++
++APPEND_SET(SOURCES
++ timer/timer_params.c
++ )
++
++#
++# src/Utilities
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/Communication)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/DDirectory)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/Timer)
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/Utilities/shared)
++
++APPEND_SET(NOINSTALLHEADERS
++ Utilities/Communication/comm.h
++ Utilities/DDirectory/DD.h
++ Utilities/Timer/timer.h
++ Utilities/shared/zoltan_util.h
++ Utilities/shared/zoltan_id.h
++ )
++
++APPEND_SET(SOURCES
++ Utilities/Communication/comm_exchange_sizes.c
++ Utilities/Communication/comm_invert_map.c
++ Utilities/Communication/comm_do.c
++ Utilities/Communication/comm_do_reverse.c
++ Utilities/Communication/comm_info.c
++ Utilities/Communication/comm_create.c
++ Utilities/Communication/comm_resize.c
++ Utilities/Communication/comm_sort_ints.c
++ Utilities/Communication/comm_destroy.c
++ Utilities/Communication/comm_invert_plan.c
++ Utilities/Timer/zoltan_timer.c
++ Utilities/Timer/timer.c
++ Utilities/DDirectory/DD_Find.c
++ Utilities/DDirectory/DD_Destroy.c
++ Utilities/DDirectory/DD_Set_Neighbor_Hash_Fn3.c
++ Utilities/DDirectory/DD_Remove.c
++ Utilities/DDirectory/DD_Create.c
++ Utilities/DDirectory/DD_Update.c
++ Utilities/DDirectory/DD_Stats.c
++ Utilities/DDirectory/DD_Hash2.c
++ Utilities/DDirectory/DD_Print.c
++ Utilities/DDirectory/DD_Set_Neighbor_Hash_Fn2.c
++ Utilities/DDirectory/DD_Set_Hash_Fn.c
++ Utilities/DDirectory/DD_Set_Neighbor_Hash_Fn1.c
++ Utilities/Memory/mem.c
++ Utilities/shared/zoltan_align.c
++ Utilities/shared/zoltan_id.c
++ )
++
++#
++# src/zz
++#
++
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/zz)
++
++APPEND_SET(NOINSTALLHEADERS
++ zz/zz_const.h
++ zz/zz_heap.h
++ zz/zz_id_const.h
++ zz/zz_rand.h
++ zz/zz_sort.h
++ zz/zz_util_const.h
++ )
++
++APPEND_SET(SOURCES
++ zz/zz_coord.c
++ zz/zz_gen_files.c
++ zz/zz_hash.c
++ zz/zz_map.c
++ zz/zz_heap.c
++ zz/zz_init.c
++ zz/zz_obj_list.c
++ zz/zz_rand.c
++ zz/zz_set_fn.c
++ zz/zz_sort.c
++ zz/zz_struct.c
++ zz/zz_back_trace.c
++ zz/zz_util.c
++ )
++
++
++#
++# src/fort
++#
++
++IF(Trilinos_ENABLE_Fortran AND BUILD_ZOLTAN_F90_INTERFACE)
++ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/fort)
++
++ APPEND_SET(NOINSTALLHEADERS
++ fort/cwrap_fmangle.h
++ fort/lbfn.h
++ fort/lbif.h
++ fort/set_borderobjlist.fn
++ fort/set_borderobjlist.fn.lbfn
++ fort/set_borderobjlist.if
++ fort/set_borderobjlist.if.lbif
++ fort/set_childlist.fn
++ fort/set_childlist.fn.lbfn
++ fort/set_childlist.if
++ fort/set_childlist.if.lbif
++ fort/set_childweight.fn
++ fort/set_childweight.fn.lbfn
++ fort/set_childweight.if
++ fort/set_childweight.if.lbif
++ fort/set_coarseobjlist.fn
++ fort/set_coarseobjlist.fn.lbfn
++ fort/set_coarseobjlist.if
++ fort/set_coarseobjlist.if.lbif
++ fort/set_edgelist.fn
++ fort/set_edgelist.fn.lbfn
++ fort/set_edgelist.if
++ fort/set_edgelist.if.lbif
++ fort/set_edgelistmulti.fn
++ fort/set_edgelistmulti.if
++ fort/set_firstborderobj.fn
++ fort/set_firstborderobj.fn.lbfn
++ fort/set_firstborderobj.if
++ fort/set_firstborderobj.if.lbif
++ fort/set_firstcoarseobj.fn
++ fort/set_firstcoarseobj.fn.lbfn
++ fort/set_firstcoarseobj.if
++ fort/set_firstcoarseobj.if.lbif
++ fort/set_firstobj.fn
++ fort/set_firstobj.fn.lbfn
++ fort/set_firstobj.if
++ fort/set_firstobj.if.lbif
++ fort/set_fixedobjlist.fn
++ fort/set_fixedobjlist.if
++ fort/set_geom.fn
++ fort/set_geom.fn.lbfn
++ fort/set_geom.if
++ fort/set_geom.if.lbif
++ fort/set_geommulti.fn
++ fort/set_geommulti.if
++ fort/set_hgcs.fn
++ fort/set_hgcs.if
++ fort/set_hgedgeweights.fn
++ fort/set_hgedgeweights.if
++ fort/set_hgsizecs.fn
++ fort/set_hgsizecs.if
++ fort/set_hgsizeedgeweights.fn
++ fort/set_hgsizeedgeweights.if
++ fort/set_hiermethod.fn
++ fort/set_hiermethod.if
++ fort/set_hiernumlevels.fn
++ fort/set_hiernumlevels.if
++ fort/set_hierpartition.fn
++ fort/set_hierpartition.if
++ fort/set_midmigrate.fn
++ fort/set_midmigrate.fn.lbfn
++ fort/set_midmigrate.if
++ fort/set_midmigrate.if.lbif
++ fort/set_midmigratepp.fn
++ fort/set_midmigratepp.if
++ fort/set_nextborderobj.fn
++ fort/set_nextborderobj.fn.lbfn
++ fort/set_nextborderobj.if
++ fort/set_nextborderobj.if.lbif
++ fort/set_nextcoarseobj.fn
++ fort/set_nextcoarseobj.fn.lbfn
++ fort/set_nextcoarseobj.if
++ fort/set_nextcoarseobj.if.lbif
++ fort/set_nextobj.fn
++ fort/set_nextobj.fn.lbfn
++ fort/set_nextobj.if
++ fort/set_nextobj.if.lbif
++ fort/set_numborderobj.fn
++ fort/set_numborderobj.fn.lbfn
++ fort/set_numborderobj.if
++ fort/set_numborderobj.if.lbif
++ fort/set_numchild.fn
++ fort/set_numchild.fn.lbfn
++ fort/set_numchild.if
++ fort/set_numchild.if.lbif
++ fort/set_numcoarseobj.fn
++ fort/set_numcoarseobj.fn.lbfn
++ fort/set_numcoarseobj.if
++ fort/set_numcoarseobj.if.lbif
++ fort/set_numedges.fn
++ fort/set_numedges.fn.lbfn
++ fort/set_numedges.if
++ fort/set_numedges.if.lbif
++ fort/set_numedgesmulti.fn
++ fort/set_numedgesmulti.if
++ fort/set_numfixedobj.fn
++ fort/set_numfixedobj.if
++ fort/set_numgeom.fn
++ fort/set_numgeom.fn.lbfn
++ fort/set_numgeom.if
++ fort/set_numgeom.if.lbif
++ fort/set_numobj.fn
++ fort/set_numobj.fn.lbfn
++ fort/set_numobj.if
++ fort/set_numobj.if.lbif
++ fort/set_objlist.fn
++ fort/set_objlist.fn.lbfn
++ fort/set_objlist.if
++ fort/set_objlist.if.lbif
++ fort/set_objsize.fn
++ fort/set_objsize.fn.lbfn
++ fort/set_objsize.if
++ fort/set_objsize.if.lbif
++ fort/set_objsizemulti.fn
++ fort/set_objsizemulti.if
++ fort/set_packobj.fn
++ fort/set_packobj.fn.lbfn
++ fort/set_packobj.if
++ fort/set_packobj.if.lbif
++ fort/set_packobjmulti.fn
++ fort/set_packobjmulti.if
++ fort/set_partition.fn
++ fort/set_partition.if
++ fort/set_partitionmulti.fn
++ fort/set_partitionmulti.if
++ fort/set_postmigrate.fn
++ fort/set_postmigrate.fn.lbfn
++ fort/set_postmigrate.if
++ fort/set_postmigrate.if.lbif
++ fort/set_postmigratepp.fn
++ fort/set_postmigratepp.if
++ fort/set_premigrate.fn
++ fort/set_premigrate.fn.lbfn
++ fort/set_premigrate.if
++ fort/set_premigrate.if.lbif
++ fort/set_premigratepp.fn
++ fort/set_premigratepp.if
++ fort/set_unpackobj.fn
++ fort/set_unpackobj.fn.lbfn
++ fort/set_unpackobj.if
++ fort/set_unpackobj.if.lbif
++ fort/set_unpackobjmulti.fn
++ fort/set_unpackobjmulti.if
++ )
++
++ APPEND_SET(SOURCES
++ fort/ztypes.f90
++ fort/zoltan_user_data.f90
++ fort/lb_user_const.f90
++ fort/fwrap.f90
++ fort/cwrap.c
++ )
++
++# FILE(GLOB MODULES ${CMAKE_CURRENT_BINARY_DIR}/*.mod)
++# MESSAGE("KDDKDD MODULES " ${MODULES})
++
++ APPEND_SET(MODULES
++ ${CMAKE_CURRENT_BINARY_DIR}/zoltan.mod
++ ${CMAKE_CURRENT_BINARY_DIR}/zoltan_types.mod
++ ${CMAKE_CURRENT_BINARY_DIR}/lb_user_const.mod
++ ${CMAKE_CURRENT_BINARY_DIR}/zoltan_user_data.mod
++ )
++
++ENDIF()
++
++
++#
++# C) Define the targets for package's library(s)
++#
++
++IF (NOT TPL_ENABLE_MPI)
++ SET(DEPLIBS simpi)
++ENDIF()
++
++PACKAGE_ADD_LIBRARY(
++ zoltan
++ HEADERS ${HEADERS}
++ NOINSTALLHEADERS ${NOINSTALLHEADERS}
++ SOURCES ${SOURCES}
++ DEPLIBS ${DEPLIBS}
++ )
++
++INSTALL(FILES ${MODULES} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
++
Modified: packages/trilinos/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/series?rev=44480&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/series (original)
+++ packages/trilinos/trunk/debian/patches/series Mon Feb 13 10:28:46 2012
@@ -1,4 +1,2 @@
soname.patch
-trilinosversion.patch
libname.patch
-
Modified: packages/trilinos/trunk/debian/patches/soname.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/patches/soname.patch?rev=44480&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/patches/soname.patch (original)
+++ packages/trilinos/trunk/debian/patches/soname.patch Mon Feb 13 10:28:46 2012
@@ -1,17 +1,33 @@
-Index: trilinos-10.8.2.dfsg/cmake/package_arch/PackageLibraryMacros.cmake
-===================================================================
---- 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
+diff -Nru trilinos-10.8.5.dfsg.orig/cmake/package_arch/PackageLibraryMacros.cmake trilinos-10.8.5.dfsg/cmake/package_arch/PackageLibraryMacros.cmake
+--- trilinos-10.8.5.dfsg.orig/cmake/package_arch/PackageLibraryMacros.cmake 2012-01-09 18:08:07.000000000 +0100
++++ trilinos-10.8.5.dfsg/cmake/package_arch/PackageLibraryMacros.cmake 2012-02-06 12:41:29.407281506 +0100
@@ -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)
-+ SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES
-+ ${Trilinos_LIBRARY_PROPERTIES})
-+ ENDIF(Trilinos_LIBRARY_PROPERTIES)
++ # Apply user-defined properties to the library target.
++ IF (Trilinos_LIBRARY_PROPERTIES)
++ SET_TARGET_PROPERTIES(${LIBRARY_NAME} PROPERTIES
++ ${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})
+diff -Nru trilinos-10.8.5.dfsg.orig/cmake/TrilinosVersion.cmake trilinos-10.8.5.dfsg/cmake/TrilinosVersion.cmake
+--- trilinos-10.8.5.dfsg.orig/cmake/TrilinosVersion.cmake 2012-01-09 18:08:07.000000000 +0100
++++ trilinos-10.8.5.dfsg/cmake/TrilinosVersion.cmake 2012-02-06 12:45:47.471272379 +0100
+@@ -72,3 +72,13 @@
+ SET(TRILINOS_MAJOR_VERSION TRUE)
+ SET(TRILINOS_MAJOR_MINOR_VERSION TRUE)
+ SET(TRILINOS_VERSION_STRING TRUE)
++
++IF(NOT Trilinos_NO_LIBRARY_VERSION)
++ # This setting of SOVERSION assumes that any API change
++ # will increment either the minor or major version number of Trilinos.
++ STRING(REGEX REPLACE "(.+)\\.(.+)\\.(.+)" "\\2" Trilinos_MINOR_VERSION "${Trilinos_VERSION_STRING}")
++ SET(Trilinos_LIBRARY_PROPERTIES
++ VERSION "${Trilinos_VERSION}"
++ SOVERSION "${Trilinos_MAJOR_VERSION}.${Trilinos_MINOR_VERSION}"
++ )
++ENDIF(NOT Trilinos_NO_LIBRARY_VERSION)
Modified: packages/trilinos/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/trilinos/trunk/debian/rules?rev=44480&op=diff
==============================================================================
--- packages/trilinos/trunk/debian/rules (original)
+++ packages/trilinos/trunk/debian/rules Mon Feb 13 10:28:46 2012
@@ -2,7 +2,7 @@
BUILDDIR = $(CURDIR)/debian/build
TRILINOS_HOME = $(CURDIR)/$(DEB_SRCDIR)
-PYVERS := $(shell pyversions -vr debian/control)
+PYVERS := $(shell pyversions -dv)
export CC=/usr/bin/mpicc
export CXX=/usr/bin/mpic++
@@ -29,7 +29,8 @@
-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 \
+ -D NOX_ENABLE_LAPACK:BOOL=ON \
+ -D SWIG_EXECUTABLE:FILEPATH=/usr/bin/swig2.0 \
$(TRILINOS_HOME)
override_dh_auto_clean:
@@ -39,24 +40,23 @@
for v in $(PYVERS); do \
rm -rf $(BUILDDIR)$$v; \
done
-
+
-rm packages/stk/stk_percept/stk_percept/sparsehash/config.status
-rm -rf SIERRA/bjam
- # retreive backup copy of files to enable rebuild
+# 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
override_dh_auto_configure:
-
- # create a backup copy of files to enable rebuild
+# 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 \
@@ -73,24 +73,15 @@
for v in $(PYVERS); do \
dh_auto_install --builddirectory=$(BUILDDIR)$$v; \
done
+ dh_python2 --no-guessing-versions -ppython-pytrilinos
- #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::
+#install/libtrilinos-doc::
-chmod -x packages/didasko/doc/DoxyfileWeb
+DEB_SOURCE_PACKAGE := $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
+DEB_NOEPOCH_VERSION := $(shell echo $(DEB_VERSION) | cut -d: -f2-)
+DEB_UPSTREAM_VERSION := $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
.PHONY: get-orig-source
@@ -110,5 +101,3 @@
$(CURDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig ; \
rm -rf "$$TMPDIR"
-
-
More information about the debian-science-commits
mailing list