From bd4e243e7b756fe34954520c91b790e72880e4cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloemer@gmail.com>
Date: Wed, 8 Apr 2015 10:43:26 +0200
Subject: [PATCH 01/10] start cleaning up the export files

This commit makes sure that the exported *_LIBRARIES variable only contains
libraries from the current package, not all of its dependencies. The dependency
management is done my CMake's target export files already.

The same goes for the TPL variables.
---
 .../TribitsPackageConfigTemplate.cmake.in     |  9 ++++---
 .../TribitsWriteClientExportFiles.cmake       | 26 ++++++++++++++++---
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in b/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in
index 65ef7c51f..d8055417f 100644
--- a/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in
+++ b/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in
@@ -92,7 +92,7 @@ SET(${EXPORT_FILE_VAR_PREFIX}_INCLUDE_DIRS "${FULL_INCLUDE_DIRS_SET}")
 SET(${EXPORT_FILE_VAR_PREFIX}_LIBRARY_DIRS "${FULL_LIBRARY_DIRS_SET}")
 
 ## List of package libraries
-SET(${EXPORT_FILE_VAR_PREFIX}_LIBRARIES "${FULL_LIBRARY_SET}")
+SET(${EXPORT_FILE_VAR_PREFIX}_LIBRARIES "${${PACKAGE_NAME}_LIBRARIES}")
 
 ## Specification of directories for TPL headers
 SET(${EXPORT_FILE_VAR_PREFIX}_TPL_INCLUDE_DIRS "${${PACKAGE_NAME}_TPL_INCLUDE_DIRS}")
@@ -121,9 +121,12 @@ SET(${EXPORT_FILE_VAR_PREFIX}_MPI_EXEC_NUMPROCS_FLAG "${MPI_EXEC_NUMPROCS_FLAG}"
 ## ---------------------------------------------------------------------------
 
 ## The packages enabled for this project
-SET(${EXPORT_FILE_VAR_PREFIX}_PACKAGE_LIST "${FULL_PACKAGE_SET}")
+SET(
+  ${EXPORT_FILE_VAR_PREFIX}_PACKAGE_LIST
+  "${${PACKAGE_NAME}_FULL_ENABLED_DEP_PACKAGES}"
+  )
 
 ## The TPLs enabled for this project
-SET(${EXPORT_FILE_VAR_PREFIX}_TPL_LIST "${ORDERED_FULL_TPL_SET}")
+SET(${EXPORT_FILE_VAR_PREFIX}_TPL_LIST "${MY_TPL_SET}")
 
 ${PACKAGE_CONFIG_CODE}
diff --git a/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake b/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
index df3ebad81..13c5d9582 100644
--- a/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
+++ b/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
@@ -233,15 +233,14 @@ FUNCTION(TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES)
 
   SET(FULL_PACKAGE_SET "")
   SET(FULL_LIBRARY_SET "")
+  SET(FULL_INCLUDE_DIRS_SET "")
+  SET(FULL_LIBRARY_DIRS_SET "")
 
   SET(SET_INCLUDE_LIBRARY_DIRS_FROM_UPSTREAM TRUE)
   IF (${PACKAGE_NAME}_INCLUDE_DIRS)
     SET(FULL_INCLUDE_DIRS_SET ${${PACKAGE_NAME}_INCLUDE_DIRS})
     SET(FULL_LIBRARY_DIRS_SET ${${PACKAGE_NAME}_LIBRARY_DIRS})
     SET(SET_INCLUDE_LIBRARY_DIRS_FROM_UPSTREAM FALSE)
-  ELSE()
-    SET(FULL_INCLUDE_DIRS_SET "")
-    SET(FULL_LIBRARY_DIRS_SET "")
   ENDIF()
 
   IF (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP)
@@ -328,6 +327,14 @@ FUNCTION(TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES)
 
   # C.1) Get the set of enabled TPLs
 
+  SET(MY_TPL_SET "")
+  LIST(APPEND MY_TPL_SET ${${PACKAGE_NAME}_LIB_REQUIRED_DEP_TPLS})
+  FOREACH(TPL ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_TPLS})
+    IF(${PACKAGE_NAME}_ENABLE_${TPL})
+      LIST(APPEND MY_TPL_SET ${TPL})
+    ENDIF()
+  ENDFOREACH()
+
   SET(FULL_TPL_SET "")
   FOREACH(TRIBITS_PACKAGE ${FULL_PACKAGE_SET})
     LIST(APPEND FULL_TPL_SET ${${TRIBITS_PACKAGE}_LIB_REQUIRED_DEP_TPLS})
@@ -340,6 +347,17 @@ FUNCTION(TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES)
       ENDIF()
     ENDFOREACH()
   ENDFOREACH()
+  FOREACH(TRIBITS_PACKAGE ${FULL_PACKAGE_SET})
+    LIST(APPEND FULL_TPL_SET ${${TRIBITS_PACKAGE}_LIB_REQUIRED_DEP_TPLS})
+    SET(OPTIONAL_TPLS ${${TRIBITS_PACKAGE}_LIB_OPTIONAL_DEP_TPLS})
+    FOREACH(TPL ${OPTIONAL_TPLS})
+      # Only add if support for the optional TPL is enabled in this
+      # package.  Don't just check if the TPL is enabled!
+      IF(${TRIBITS_PACKAGE}_ENABLE_${TPL})
+        LIST(APPEND FULL_TPL_SET ${TPL})
+      ENDIF()
+    ENDFOREACH()
+  ENDFOREACH()
   IF (TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES_DEBUG_DUMP)
     PRINT_VAR(FULL_TPL_SET)
   ENDIF()
@@ -366,7 +384,7 @@ FUNCTION(TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES)
   SET(${PACKAGE_NAME}_TPL_LIBRARIES "")
   SET(${PACKAGE_NAME}_TPL_INCLUDE_DIRS "")
   SET(${PACKAGE_NAME}_TPL_LIBRARY_DIRS "")
-  FOREACH(TPL ${ORDERED_FULL_TPL_SET})
+  FOREACH(TPL ${ORDERED_MY_TPL_SET})
     LIST(APPEND ${PACKAGE_NAME}_TPL_LIBRARIES ${TPL_${TPL}_LIBRARIES})
     LIST(APPEND ${PACKAGE_NAME}_TPL_INCLUDE_DIRS ${TPL_${TPL}_INCLUDE_DIRS})
     LIST(APPEND ${PACKAGE_NAME}_TPL_LIBRARY_DIRS ${TPL_${TPL}_LIBRARY_DIRS})

From a1042242353891e96ec6cbb38bfafbaf7b1f9c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloemer@gmail.com>
Date: Wed, 8 Apr 2015 10:48:23 +0200
Subject: [PATCH 02/10] export files: INCLUDE() dependencies in FOREACH loop

Before, each INCLUDE() dependency was listed individually.

This commit significantly shortens the export files.
---
 .../TribitsWriteClientExportFiles.cmake            | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake b/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
index 13c5d9582..7643abfea 100644
--- a/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
+++ b/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
@@ -532,15 +532,11 @@ INCLUDE(\"${${PROJECT_NAME}_BINARY_DIR}/${PROJECT_NAME}Targets.cmake\")"
 
   IF (${PACKAGE_NAME}_FULL_ENABLED_DEP_PACKAGES)
     SET(PACKAGE_CONFIG_CODE "${PACKAGE_CONFIG_CODE}
-# Include configuration of dependent packages")
-  ENDIF()
-  FOREACH(DEP_PACKAGE ${${PACKAGE_NAME}_FULL_ENABLED_DEP_PACKAGES})
-    SET(PACKAGE_CONFIG_CODE "${PACKAGE_CONFIG_CODE}
-INCLUDE(\"\${CMAKE_CURRENT_LIST_DIR}/../${DEP_PACKAGE}/${DEP_PACKAGE}Config.cmake\")"
-)
-  ENDFOREACH()
-  IF(${PACKAGE_NAME}_FULL_ENABLED_DEP_PACKAGES)
-    SET(PACKAGE_CONFIG_CODE "${PACKAGE_CONFIG_CODE}\n")
+# Include configuration of dependent packages
+FOREACH(DEP_PACKAGE \${${PACKAGE_NAME}_PACKAGE_LIST})
+  INCLUDE(\"\${CMAKE_CURRENT_LIST_DIR}/../\${DEP_PACKAGE}/\${DEP_PACKAGE}Config.cmake\")
+ENDFOREACH()
+")
   ENDIF()
 
   # Import install tree targets into applications.

From 3abfb337bf326c7439bbaaa927a4fa2c91c82ddb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloemer@gmail.com>
Date: Wed, 8 Apr 2015 10:49:23 +0200
Subject: [PATCH 03/10] export files: remove redundant definition of
 CMAKE_CURRENT_LIST_DIR

This variable is intrinsic to CMake since 2.8.3.
---
 .../core/package_arch/TribitsWriteClientExportFiles.cmake   | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake b/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
index 7643abfea..6468fc19b 100644
--- a/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
+++ b/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
@@ -102,12 +102,6 @@ IF (${EXPORT_FILE_VAR_PREFIX}_CONFIG_INCLUDED)
   RETURN()
 ENDIF()
 SET(${EXPORT_FILE_VAR_PREFIX}_CONFIG_INCLUDED TRUE)
-
-# Make sure CMAKE_CURRENT_LIST_DIR is usable
-IF (NOT DEFINED CMAKE_CURRENT_LIST_DIR)
-  GET_FILENAME_COMPONENT(_THIS_SCRIPT_PATH \${CMAKE_CURRENT_LIST_FILE} PATH)
-  SET(CMAKE_CURRENT_LIST_DIR \${_THIS_SCRIPT_PATH})
-ENDIF()
 "
   PARENT_SCOPE )
 ENDFUNCTION()

From 0275b3dda4ceaca8c69f16aa050f4a39ecf13669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloemer@gmail.com>
Date: Wed, 8 Apr 2015 10:51:11 +0200
Subject: [PATCH 04/10] don't use ALL dependencies in PACKAGE_LIST

We really only need the direct dependencies of the respective package.
---
 .../installation/TribitsPackageConfigTemplate.cmake.in    | 5 +----
 .../core/package_arch/TribitsWriteClientExportFiles.cmake | 8 ++++++++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in b/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in
index d8055417f..c713943c3 100644
--- a/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in
+++ b/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in
@@ -121,10 +121,7 @@ SET(${EXPORT_FILE_VAR_PREFIX}_MPI_EXEC_NUMPROCS_FLAG "${MPI_EXEC_NUMPROCS_FLAG}"
 ## ---------------------------------------------------------------------------
 
 ## The packages enabled for this project
-SET(
-  ${EXPORT_FILE_VAR_PREFIX}_PACKAGE_LIST
-  "${${PACKAGE_NAME}_FULL_ENABLED_DEP_PACKAGES}"
-  )
+SET(${EXPORT_FILE_VAR_PREFIX}_PACKAGE_LIST ${MY_DEP_SET})
 
 ## The TPLs enabled for this project
 SET(${EXPORT_FILE_VAR_PREFIX}_TPL_LIST "${MY_TPL_SET}")
diff --git a/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake b/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
index 6468fc19b..1c7c6fa89 100644
--- a/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
+++ b/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
@@ -315,6 +315,14 @@ FUNCTION(TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES)
     PRINT_VAR(FULL_LIBRARY_DIRS_SET)
   ENDIF()
 
+  SET(MY_DEP_SET "")
+  LIST(APPEND MY_DEP_SET ${${PACKAGE_NAME}_LIB_REQUIRED_DEP_PACKAGES})
+  FOREACH(DEP ${${PACKAGE_NAME}_LIB_OPTIONAL_DEP_PACKAGES})
+    IF(${PACKAGE_NAME}_ENABLE_${DEP})
+      LIST(APPEND MY_DEP_SET ${DEP})
+    ENDIF()
+  ENDFOREACH()
+
   #
   # C) Get the set of TPLs for this package that are enabled
   #

From 677330eabe2abf226a19dfc7c4045c34f0ab1af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloemer@gmail.com>
Date: Wed, 8 Apr 2015 10:52:00 +0200
Subject: [PATCH 05/10] typo in variable name

---
 tribits/core/package_arch/TribitsWriteClientExportFiles.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake b/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
index 1c7c6fa89..6e3a1e933 100644
--- a/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
+++ b/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
@@ -386,7 +386,7 @@ FUNCTION(TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES)
   SET(${PACKAGE_NAME}_TPL_LIBRARIES "")
   SET(${PACKAGE_NAME}_TPL_INCLUDE_DIRS "")
   SET(${PACKAGE_NAME}_TPL_LIBRARY_DIRS "")
-  FOREACH(TPL ${ORDERED_MY_TPL_SET})
+  FOREACH(TPL ${MY_TPL_SET})
     LIST(APPEND ${PACKAGE_NAME}_TPL_LIBRARIES ${TPL_${TPL}_LIBRARIES})
     LIST(APPEND ${PACKAGE_NAME}_TPL_INCLUDE_DIRS ${TPL_${TPL}_INCLUDE_DIRS})
     LIST(APPEND ${PACKAGE_NAME}_TPL_LIBRARY_DIRS ${TPL_${TPL}_LIBRARY_DIRS})

From e985970baa1d5797b06fdb037409cbffa53ac1f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloemer@gmail.com>
Date: Wed, 8 Apr 2015 10:56:00 +0200
Subject: [PATCH 06/10] fix for Makefile exports, adapt cmake export tests

---
 ...bitsWriteClientExportFiles_UnitTests.cmake | 22 +++++++++----------
 .../TribitsPackageConfigTemplate.cmake.in     |  6 ++---
 .../TribitsWriteClientExportFiles.cmake       | 10 ++++++++-
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/test/core/TribitsWriteClientExportFiles_UnitTests.cmake b/test/core/TribitsWriteClientExportFiles_UnitTests.cmake
index 5426cd0ef..63206c2ba 100644
--- a/test/core/TribitsWriteClientExportFiles_UnitTests.cmake
+++ b/test/core/TribitsWriteClientExportFiles_UnitTests.cmake
@@ -129,12 +129,12 @@ FUNCTION(UNITTEST_WRITE_SPECIALIZED_PACKAGE_EXPORT_MAKEFILE_RTOP_BEFORE_LIBS)
       "SET.RTOp1_CONFIG_INCLUDED TRUE."
       "SET.RTOp1_INCLUDE_DIRS .teuchos/core/include.teuchos/numeric/include.."
       "SET.RTOp1_LIBRARY_DIRS .teuchos/core/src.teuchos/numeric/src.."
-      "SET.RTOp1_LIBRARIES .teuchoscore.teuchosnumeric.."
-      "SET.RTOp1_TPL_INCLUDE_DIRS .lapackhpath/include.blaspath/include.."
-      "SET.RTOp1_TPL_LIBRARY_DIRS .lapackhpath/lib.blashpath/lib.."
-      "SET.RTOp1_TPL_LIBRARIES .lapackpath/lib/liblapack.a.blaspath/lib/libblas.a.."
+      "SET.RTOp1_LIBRARIES .."
+      "SET.RTOp1_TPL_INCLUDE_DIRS .."
+      "SET.RTOp1_TPL_LIBRARY_DIRS .."
+      "SET.RTOp1_TPL_LIBRARIES .."
       "SET.RTOp1_PACKAGE_LIST .Teuchos.."
-      "SET.RTOp1_TPL_LIST .LAPACK.BLAS.."
+      "SET.RTOp1_TPL_LIST .."
     )
 
   UNITTEST_FILE_REGEX("${GENERATED_EXPORT_MAKEFILE}"
@@ -207,12 +207,12 @@ FUNCTION(UNITTEST_WRITE_SPECIALIZED_PACKAGE_EXPORT_MAKEFILE_RTOP_AFTER_LIBS)
       "SET.RTOp2_CONFIG_INCLUDED TRUE."
       "SET.RTOp2_INCLUDE_DIRS .rtop/include.teuchos/core/include.teuchos/numeric/include.."
       "SET.RTOp2_LIBRARY_DIRS .rtop/src.teuchos/core/src.teuchos/numeric/src.."
-      "SET.RTOp2_LIBRARIES .rtop.teuchoscore.teuchosnumeric.."
-      "SET.RTOp2_TPL_INCLUDE_DIRS .lapackhpath/include.blaspath/include.."
-      "SET.RTOp2_TPL_LIBRARY_DIRS .lapackhpath/lib.blashpath/lib.."
-      "SET.RTOp2_TPL_LIBRARIES .lapackpath/lib/liblapack.a.blaspath/lib/libblas.a.."
-      "SET.RTOp2_PACKAGE_LIST .RTOp.Teuchos.."
-      "SET.RTOp2_TPL_LIST .LAPACK.BLAS.."
+      "SET.RTOp2_LIBRARIES .rtop."
+      "SET.RTOp2_TPL_INCLUDE_DIRS .."
+      "SET.RTOp2_TPL_LIBRARY_DIRS .."
+      "SET.RTOp2_TPL_LIBRARIES .."
+      "SET.RTOp2_PACKAGE_LIST .Teuchos.."
+      "SET.RTOp2_TPL_LIST .."
     )
 
   UNITTEST_FILE_REGEX("${GENERATED_EXPORT_MAKEFILE}"
diff --git a/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in b/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in
index c713943c3..ba07e57fb 100644
--- a/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in
+++ b/tribits/core/installation/TribitsPackageConfigTemplate.cmake.in
@@ -95,13 +95,13 @@ SET(${EXPORT_FILE_VAR_PREFIX}_LIBRARY_DIRS "${FULL_LIBRARY_DIRS_SET}")
 SET(${EXPORT_FILE_VAR_PREFIX}_LIBRARIES "${${PACKAGE_NAME}_LIBRARIES}")
 
 ## Specification of directories for TPL headers
-SET(${EXPORT_FILE_VAR_PREFIX}_TPL_INCLUDE_DIRS "${${PACKAGE_NAME}_TPL_INCLUDE_DIRS}")
+SET(${EXPORT_FILE_VAR_PREFIX}_TPL_INCLUDE_DIRS "${MY_${PACKAGE_NAME}_TPL_INCLUDE_DIRS}")
 
 ## Specification of directories for TPL libraries
-SET(${EXPORT_FILE_VAR_PREFIX}_TPL_LIBRARY_DIRS "${${PACKAGE_NAME}_TPL_LIBRARY_DIRS}")
+SET(${EXPORT_FILE_VAR_PREFIX}_TPL_LIBRARY_DIRS "${MY_${PACKAGE_NAME}_TPL_LIBRARY_DIRS}")
 
 ## List of required TPLs
-SET(${EXPORT_FILE_VAR_PREFIX}_TPL_LIBRARIES "${${PACKAGE_NAME}_TPL_LIBRARIES}")
+SET(${EXPORT_FILE_VAR_PREFIX}_TPL_LIBRARIES "${MY_${PACKAGE_NAME}_TPL_LIBRARIES}")
 
 ## ---------------------------------------------------------------------------
 ## MPI specific variables
diff --git a/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake b/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
index 6e3a1e933..c341f9f62 100644
--- a/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
+++ b/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake
@@ -382,11 +382,19 @@ FUNCTION(TRIBITS_WRITE_FLEXIBLE_PACKAGE_CLIENT_EXPORT_FILES)
   # D) Get the libraries, library dirs, and the include dirs for the
   # upstream enabled TPLs
   #
+  SET(MY_${PACKAGE_NAME}_TPL_LIBRARIES "")
+  SET(MY_${PACKAGE_NAME}_TPL_INCLUDE_DIRS "")
+  SET(MY_${PACKAGE_NAME}_TPL_LIBRARY_DIRS "")
+  FOREACH(TPL ${MY_TPL_SET})
+    LIST(APPEND MY_${PACKAGE_NAME}_TPL_LIBRARIES ${TPL_${TPL}_LIBRARIES})
+    LIST(APPEND MY_${PACKAGE_NAME}_TPL_INCLUDE_DIRS ${TPL_${TPL}_INCLUDE_DIRS})
+    LIST(APPEND MY_${PACKAGE_NAME}_TPL_LIBRARY_DIRS ${TPL_${TPL}_LIBRARY_DIRS})
+  ENDFOREACH()
 
   SET(${PACKAGE_NAME}_TPL_LIBRARIES "")
   SET(${PACKAGE_NAME}_TPL_INCLUDE_DIRS "")
   SET(${PACKAGE_NAME}_TPL_LIBRARY_DIRS "")
-  FOREACH(TPL ${MY_TPL_SET})
+  FOREACH(TPL ${ORDERED_FULL_TPL_SET})
     LIST(APPEND ${PACKAGE_NAME}_TPL_LIBRARIES ${TPL_${TPL}_LIBRARIES})
     LIST(APPEND ${PACKAGE_NAME}_TPL_INCLUDE_DIRS ${TPL_${TPL}_INCLUDE_DIRS})
     LIST(APPEND ${PACKAGE_NAME}_TPL_LIBRARY_DIRS ${TPL_${TPL}_LIBRARY_DIRS})

From 0620c0b7217697fc59cc90a807864018eab140fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloemer@gmail.com>
Date: Wed, 8 Apr 2015 20:58:08 +0200
Subject: [PATCH 07/10] fix unit test

---
 test/core/TribitsWriteClientExportFiles_UnitTests.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/core/TribitsWriteClientExportFiles_UnitTests.cmake b/test/core/TribitsWriteClientExportFiles_UnitTests.cmake
index 63206c2ba..210a39162 100644
--- a/test/core/TribitsWriteClientExportFiles_UnitTests.cmake
+++ b/test/core/TribitsWriteClientExportFiles_UnitTests.cmake
@@ -133,7 +133,7 @@ FUNCTION(UNITTEST_WRITE_SPECIALIZED_PACKAGE_EXPORT_MAKEFILE_RTOP_BEFORE_LIBS)
       "SET.RTOp1_TPL_INCLUDE_DIRS .."
       "SET.RTOp1_TPL_LIBRARY_DIRS .."
       "SET.RTOp1_TPL_LIBRARIES .."
-      "SET.RTOp1_PACKAGE_LIST .Teuchos.."
+      "SET.RTOp1_PACKAGE_LIST Teuchos."
       "SET.RTOp1_TPL_LIST .."
     )
 
@@ -211,7 +211,7 @@ FUNCTION(UNITTEST_WRITE_SPECIALIZED_PACKAGE_EXPORT_MAKEFILE_RTOP_AFTER_LIBS)
       "SET.RTOp2_TPL_INCLUDE_DIRS .."
       "SET.RTOp2_TPL_LIBRARY_DIRS .."
       "SET.RTOp2_TPL_LIBRARIES .."
-      "SET.RTOp2_PACKAGE_LIST .Teuchos.."
+      "SET.RTOp2_PACKAGE_LIST Teuchos."
       "SET.RTOp2_TPL_LIST .."
     )
 

From 9d2d4c4198eaa2bbc2bd4c4e0f794939c50a7d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloemer@gmail.com>
Date: Thu, 9 Apr 2015 00:33:44 +0200
Subject: [PATCH 08/10] fix unit test 125

---
 test/core/ExamplesUnitTests/CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/core/ExamplesUnitTests/CMakeLists.txt b/test/core/ExamplesUnitTests/CMakeLists.txt
index 6349826d1..43c7905f2 100644
--- a/test/core/ExamplesUnitTests/CMakeLists.txt
+++ b/test/core/ExamplesUnitTests/CMakeLists.txt
@@ -352,8 +352,8 @@ TRIBITS_ADD_ADVANCED_TEST( TribitsExampleProject_ALL_ST_NoFortran
       "WithSubpackages_AR = '.+'"
       "WithSubpackages_INCLUDE_DIRS = .+/TriBITS_TribitsExampleProject_ALL_ST_NoFortran;.+/TriBITS_TribitsExampleProject_ALL_ST_NoFortran/packages/with_subpackages/b/src;.+/TribitsExampleProject/packages/with_subpackages/b/src;.+/TribitsExampleProject/packages/with_subpackages/a;.+/TriBITS_TribitsExampleProject_ALL_ST_NoFortran/packages/simple_cxx/src;.+/TribitsExampleProject/packages/simple_cxx/src;.+/tpls/HeaderOnlyTpl;.+/TribitsExampleProject/packages/with_subpackages/c"
       "WithSubpackages_LIBRARY_DIRS = '.+/TriBITS_TribitsExampleProject_ALL_ST_NoFortran/packages/with_subpackages/b/src;.+/TriBITS_TribitsExampleProject_ALL_ST_NoFortran/packages/with_subpackages/a;.+/TriBITS_TribitsExampleProject_ALL_ST_NoFortran/packages/simple_cxx/src;.+/TriBITS_TribitsExampleProject_ALL_ST_NoFortran/packages/with_subpackages/c'"
-      "WithSubpackages_LIBRARIES = 'pws_c.pws_b.pws_a.simplecxx'"
-      "WithSubpackages_TPL_INCLUDE_DIRS = '.+/tribits/examples/tpls/HeaderOnlyTpl'"
+      "WithSubpackages_LIBRARIES = 'pws_c.pws_b.pws_a'"
+      "WithSubpackages_TPL_INCLUDE_DIRS = ''"
       "WithSubpackages_TPL_LIBRARY_DIRS = ''"
       "WithSubpackages_TPL_LIBRARIES = ''"
       "WithSubpackages_MPI_LIBRARIES = ''"
@@ -362,8 +362,8 @@ TRIBITS_ADD_ADVANCED_TEST( TribitsExampleProject_ALL_ST_NoFortran
       "WithSubpackages_MPI_EXEC = '${MPI_EXEC}'"
       "WithSubpackages_MPI_EXEC_MAX_NUMPROCS = '${MPI_EXEC_MAX_NUMPROCS}'"
       "WithSubpackages_MPI_EXEC_NUMPROCS_FLAG = '${MPI_EXEC_NUMPROCS_FLAG}'"
-      "WithSubpackages_PACKAGE_LIST = 'WithSubpackagesC.WithSubpackagesB.WithSubpackagesA.SimpleCxx'"
-      "WithSubpackages_TPL_LIST = 'HeaderOnlyTpl'"
+      "WithSubpackages_PACKAGE_LIST = 'WithSubpackagesA.WithSubpackagesB.WithSubpackagesC'"
+      "WithSubpackages_TPL_LIST = ''"
       "-- Configuring done"
       "-- Generating done"
 

From bc3886948ccfc38a13c3618bd1a9624239569ef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloemer@gmail.com>
Date: Thu, 9 Apr 2015 00:43:17 +0200
Subject: [PATCH 09/10] fix unit test 127

---
 test/core/ExamplesUnitTests/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/core/ExamplesUnitTests/CMakeLists.txt b/test/core/ExamplesUnitTests/CMakeLists.txt
index 43c7905f2..ebbda8a1d 100644
--- a/test/core/ExamplesUnitTests/CMakeLists.txt
+++ b/test/core/ExamplesUnitTests/CMakeLists.txt
@@ -598,8 +598,8 @@ TRIBITS_ADD_ADVANCED_TEST( TribitsExampleProject_ALL_PT_NoFortran
     PASS_REGULAR_EXPRESSION_ALL
       "WithSubpackages_INCLUDE_DIRS = '.+/install/lib/cmake/WithSubpackages/../../../include'"
       "WithSubpackages_LIBRARY_DIRS = '.+/install/lib/cmake/WithSubpackages/../../../lib'"
-      "WithSubpackages_LIBRARIES = 'pws_a.simplecxx'"
-      "WithSubpackages_PACKAGE_LIST = 'WithSubpackagesA.SimpleCxx'"
+      "WithSubpackages_LIBRARIES = 'pws_a'"
+      "WithSubpackages_PACKAGE_LIST = 'WithSubpackagesA'"
   )
 
 

From ed915733ca0f0121dc9a6026f97dbac7c0980a65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nico=20Schl=C3=B6mer?= <nico.schloemer@gmail.com>
Date: Thu, 9 Apr 2015 08:33:18 +0200
Subject: [PATCH 10/10] /bin/env  ->  /usr/bin/env

---
 tribits/ci_support/TribitsDependencies.py     | 2 +-
 tribits/python_utils/generic-looping-demon.py | 2 +-
 tribits/python_utils/mailmsg.py               | 2 +-
 tribits/python_utils/mockprogram.py           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tribits/ci_support/TribitsDependencies.py b/tribits/ci_support/TribitsDependencies.py
index fc782a344..51719c98a 100644
--- a/tribits/ci_support/TribitsDependencies.py
+++ b/tribits/ci_support/TribitsDependencies.py
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python
 
 # @HEADER
 # ************************************************************************
diff --git a/tribits/python_utils/generic-looping-demon.py b/tribits/python_utils/generic-looping-demon.py
index f2af393f1..40d24403a 100755
--- a/tribits/python_utils/generic-looping-demon.py
+++ b/tribits/python_utils/generic-looping-demon.py
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python
 
 # @HEADER
 # ************************************************************************
diff --git a/tribits/python_utils/mailmsg.py b/tribits/python_utils/mailmsg.py
index 6d7a4cf89..825f1e794 100755
--- a/tribits/python_utils/mailmsg.py
+++ b/tribits/python_utils/mailmsg.py
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python
 
 # @HEADER
 # ************************************************************************
diff --git a/tribits/python_utils/mockprogram.py b/tribits/python_utils/mockprogram.py
index 27b8396e4..bc0e7e09d 100755
--- a/tribits/python_utils/mockprogram.py
+++ b/tribits/python_utils/mockprogram.py
@@ -1,4 +1,4 @@
-#!/bin/env python
+#!/usr/bin/env python
 
 # @HEADER
 # ************************************************************************