diff --git a/packages/PyTrilinos2/CMakeLists.txt b/packages/PyTrilinos2/CMakeLists.txt
index 0f10a322230d..4f55dc386b2e 100644
--- a/packages/PyTrilinos2/CMakeLists.txt
+++ b/packages/PyTrilinos2/CMakeLists.txt
@@ -28,15 +28,13 @@ find_package(pybind11 REQUIRED)
 
 ###################################################################################################
 
-ASSERT_DEFINED(
-  BUILD_SHARED_LIBS
-  Python3_EXECUTABLE
-  Python3_VERSION_MAJOR
-  Python3_VERSION_MINOR
-  ${PACKAGE_NAME}_ENABLE_MueLu
-  Tpetra_INST_OPENMP
-  BINDER_EXECUTABLE
-)
+ASSERT_DEFINED(BUILD_SHARED_LIBS)
+ASSERT_DEFINED(Python3_EXECUTABLE)
+ASSERT_DEFINED(Python3_VERSION_MAJOR)
+ASSERT_DEFINED(Python3_VERSION_MINOR)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_MueLu)
+ASSERT_DEFINED(Tpetra_INST_OPENMP)
+ASSERT_DEFINED(BINDER_EXECUTABLE)
 
 ###################################################################################################
 
diff --git a/packages/ifpack2/example/CMakeLists.txt b/packages/ifpack2/example/CMakeLists.txt
index 917a82a858a1..9fb9daa0b8a9 100644
--- a/packages/ifpack2/example/CMakeLists.txt
+++ b/packages/ifpack2/example/CMakeLists.txt
@@ -30,10 +30,8 @@ TRIBITS_ADD_TEST(
   STANDARD_PASS_OUTPUT
 )
 
-ASSERT_DEFINED (
-  ${PACKAGE_NAME}_ENABLE_Xpetra
-  ${PACKAGE_NAME}_ENABLE_Galeri
-)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Xpetra)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Galeri)
 
 IF(${PACKAGE_NAME}_ENABLE_Xpetra AND ${PACKAGE_NAME}_ENABLE_Galeri)
 # Correctness test with maximum block size (32)
@@ -96,10 +94,8 @@ IF(${PACKAGE_NAME}_ENABLE_Xpetra AND ${PACKAGE_NAME}_ENABLE_Galeri)
   list(LENGTH TEST_ARGS len1)
   math(EXPR N_TESTS "${len1} - 1")
 
-  ASSERT_DEFINED(
-    Tpetra_INST_CUDA
-    Tpetra_INST_HIP
-  )
+  ASSERT_DEFINED(Tpetra_INST_CUDA)
+  ASSERT_DEFINED(Tpetra_INST_HIP)
 
   foreach(ARCH ${ARCHS})
     IF (Tpetra_INST_${ARCH})
diff --git a/packages/muelu/doc/Tutorial/src/CMakeLists.txt b/packages/muelu/doc/Tutorial/src/CMakeLists.txt
index c3eb8fb157d2..aff68d293fb9 100644
--- a/packages/muelu/doc/Tutorial/src/CMakeLists.txt
+++ b/packages/muelu/doc/Tutorial/src/CMakeLists.txt
@@ -1,12 +1,10 @@
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-ASSERT_DEFINED(
-  ${PACKAGE_NAME}_ENABLE_Amesos
-  ${PACKAGE_NAME}_ENABLE_AztecOO
-  ${PACKAGE_NAME}_ENABLE_Epetra
-  ${PACKAGE_NAME}_ENABLE_EpetraExt
-  ${PACKAGE_NAME}_ENABLE_Ifpack
-)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_AztecOO)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Epetra)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_EpetraExt)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Ifpack)
 
 IF(${PACKAGE_NAME}_ENABLE_Amesos
    AND ${PACKAGE_NAME}_ENABLE_AztecOO
diff --git a/packages/muelu/test/CMakeLists.txt b/packages/muelu/test/CMakeLists.txt
index 972449be3af2..7568d0077c6b 100644
--- a/packages/muelu/test/CMakeLists.txt
+++ b/packages/muelu/test/CMakeLists.txt
@@ -1,12 +1,10 @@
 INCLUDE(MueluAddSerialAndMpiTest)
 
-ASSERT_DEFINED(
-  ${PACKAGE_NAME}_ENABLE_Amesos2
-  ${PACKAGE_NAME}_ENABLE_Belos
-  ${PACKAGE_NAME}_ENABLE_Galeri
-  ${PACKAGE_NAME}_ENABLE_Ifpack2
-  Xpetra_INT_LONG_LONG
-)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos2)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Belos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Galeri)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Ifpack2)
+ASSERT_DEFINED(Xpetra_INT_LONG_LONG)
 
 TRIBITS_ADD_TEST_DIRECTORIES(unit_tests)
 
diff --git a/packages/muelu/test/convergence/CMakeLists.txt b/packages/muelu/test/convergence/CMakeLists.txt
index 825c97de2c1f..36d6d557d0de 100644
--- a/packages/muelu/test/convergence/CMakeLists.txt
+++ b/packages/muelu/test/convergence/CMakeLists.txt
@@ -1,10 +1,8 @@
 # Ensure that these cmake boolean variables are defined
-ASSERT_DEFINED(
-  ${PACKAGE_NAME}_ENABLE_Amesos
-  ${PACKAGE_NAME}_ENABLE_Amesos2
-  ${PACKAGE_NAME}_ENABLE_Belos
-  ${PACKAGE_NAME}_ENABLE_Epetra
-)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos2)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Belos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Epetra)
 
 #
 # Executable
diff --git a/packages/muelu/test/helmholtz/CMakeLists.txt b/packages/muelu/test/helmholtz/CMakeLists.txt
index c18879393981..66a3732e8414 100644
--- a/packages/muelu/test/helmholtz/CMakeLists.txt
+++ b/packages/muelu/test/helmholtz/CMakeLists.txt
@@ -1,11 +1,9 @@
 # Ensure that these cmake boolean variables are defined
-ASSERT_DEFINED(
-  ${PACKAGE_NAME}_ENABLE_Amesos
-  ${PACKAGE_NAME}_ENABLE_Amesos2
-  ${PACKAGE_NAME}_ENABLE_Belos
-  ${PACKAGE_NAME}_ENABLE_Epetra
-  ${PACKAGE_NAME}_ENABLE_Zoltan2Core
-)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos2)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Belos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Epetra)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Zoltan2Core)
 
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src)
diff --git a/packages/muelu/test/interface/CMakeLists.txt b/packages/muelu/test/interface/CMakeLists.txt
index 722ee30d6f85..8a4ae8bf115a 100644
--- a/packages/muelu/test/interface/CMakeLists.txt
+++ b/packages/muelu/test/interface/CMakeLists.txt
@@ -1,11 +1,9 @@
 # Ensure that these cmake boolean variables are defined
-ASSERT_DEFINED(
-  ${PACKAGE_NAME}_ENABLE_Amesos
-  ${PACKAGE_NAME}_ENABLE_Amesos2
-  ${PACKAGE_NAME}_ENABLE_Belos
-  ${PACKAGE_NAME}_ENABLE_Epetra
-  ${PACKAGE_NAME}_ENABLE_Zoltan2Core
-)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos2)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Belos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Epetra)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Zoltan2Core)
 
 #
 # Executable
diff --git a/packages/muelu/test/longlong/CMakeLists.txt b/packages/muelu/test/longlong/CMakeLists.txt
index 8fd486f31262..858c066e52a6 100644
--- a/packages/muelu/test/longlong/CMakeLists.txt
+++ b/packages/muelu/test/longlong/CMakeLists.txt
@@ -1,10 +1,8 @@
 # Ensure that these cmake boolean variables are defined
-ASSERT_DEFINED(
-  ${PACKAGE_NAME}_ENABLE_Amesos
-  ${PACKAGE_NAME}_ENABLE_Amesos2
-  ${PACKAGE_NAME}_ENABLE_Epetra
-  ${PACKAGE_NAME}_ENABLE_Zoltan2Core
-)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos2)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Epetra)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Zoltan2Core)
 
 #
 # Executable
diff --git a/packages/muelu/test/maxwell/CMakeLists.txt b/packages/muelu/test/maxwell/CMakeLists.txt
index 862ecb6ce6ca..27d6c681fe91 100644
--- a/packages/muelu/test/maxwell/CMakeLists.txt
+++ b/packages/muelu/test/maxwell/CMakeLists.txt
@@ -1,5 +1,7 @@
 # Ensure that these cmake boolean variables are defined
-ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Belos ${PACKAGE_NAME}_ENABLE_ML ${PACKAGE_NAME}_ENABLE_Zoltan2Core)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Belos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_ML)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Zoltan2Core)
 
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src)
diff --git a/packages/muelu/test/navierstokes/CMakeLists.txt b/packages/muelu/test/navierstokes/CMakeLists.txt
index 232fc08571cc..95fe5c9cd386 100644
--- a/packages/muelu/test/navierstokes/CMakeLists.txt
+++ b/packages/muelu/test/navierstokes/CMakeLists.txt
@@ -4,7 +4,9 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Graph) # we ne
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src/Smoothers)
 
 # first ensure that these cmake boolean variables are defined
-ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Epetra ${PACKAGE_NAME}_ENABLE_EpetraExt ${PACKAGE_NAME}_ENABLE_Amesos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Epetra)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_EpetraExt)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
 
 IF(${PACKAGE_NAME}_ENABLE_Epetra
    AND ${PACKAGE_NAME}_ENABLE_EpetraExt
diff --git a/packages/muelu/test/scaling/CMakeLists.txt b/packages/muelu/test/scaling/CMakeLists.txt
index 8ea1488439b1..490cf518a454 100644
--- a/packages/muelu/test/scaling/CMakeLists.txt
+++ b/packages/muelu/test/scaling/CMakeLists.txt
@@ -1,10 +1,8 @@
 # Ensure that these cmake boolean variables are defined
-ASSERT_DEFINED(
-  ${PACKAGE_NAME}_ENABLE_Amesos
-  ${PACKAGE_NAME}_ENABLE_Amesos2
-  ${PACKAGE_NAME}_ENABLE_Belos
-  ${PACKAGE_NAME}_ENABLE_Epetra
-)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos2)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Belos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Epetra)
 
 #
 # Executable
@@ -875,12 +873,10 @@ IF(${PACKAGE_NAME}_ENABLE_Experimental)
   ENDIF()
 ENDIF()
 
-ASSERT_DEFINED(
-  ${PACKAGE_NAME}_INST_DOUBLE_INT_LONGLONGINT
-  Tpetra_INST_SERIAL
-  Tpetra_INST_CUDA
-  Tpetra_INST_HIP
-)
+ASSERT_DEFINED(${PACKAGE_NAME}_INST_DOUBLE_INT_LONGLONGINT)
+ASSERT_DEFINED(Tpetra_INST_SERIAL)
+ASSERT_DEFINED(Tpetra_INST_CUDA)
+ASSERT_DEFINED(Tpetra_INST_HIP)
 
 IF(${PACKAGE_NAME}_INST_DOUBLE_INT_LONGLONGINT)
 
diff --git a/packages/muelu/test/simple1D/CMakeLists.txt b/packages/muelu/test/simple1D/CMakeLists.txt
index cc598b6915ba..95f4e06181fe 100644
--- a/packages/muelu/test/simple1D/CMakeLists.txt
+++ b/packages/muelu/test/simple1D/CMakeLists.txt
@@ -7,8 +7,8 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../gallery)
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../adapters/belos)
 
 # first ensure that these cmake boolean variables are defined
-ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos ${PACKAGE_NAME}_ENABLE_Ifpack)
-
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Ifpack)
 ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos2)
 
 IF(${PACKAGE_NAME}_ENABLE_Epetra)
diff --git a/packages/muelu/test/structured/CMakeLists.txt b/packages/muelu/test/structured/CMakeLists.txt
index e95c55c5856f..f7bc88c40f9d 100644
--- a/packages/muelu/test/structured/CMakeLists.txt
+++ b/packages/muelu/test/structured/CMakeLists.txt
@@ -1,5 +1,6 @@
 # Ensure that these cmake boolean variables are defined
-ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos2 ${PACKAGE_NAME}_ENABLE_Belos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos2)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Belos)
 
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src)
diff --git a/packages/muelu/test/tutorial/CMakeLists.txt b/packages/muelu/test/tutorial/CMakeLists.txt
index 1f990c6165cc..0306cf317558 100644
--- a/packages/muelu/test/tutorial/CMakeLists.txt
+++ b/packages/muelu/test/tutorial/CMakeLists.txt
@@ -2,7 +2,9 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../unit_tests)
 
 # first ensure that these cmake boolean variables are defined
-ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Galeri ${PACKAGE_NAME}_ENABLE_Isorropia ${PACKAGE_NAME}_ENABLE_Tpetra)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Galeri)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Isorropia)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Tpetra)
 
 SET(XML_FILES_ALL
     challenges/Elasticity2D_reference.xml
diff --git a/packages/muelu/test/unit_tests/CMakeLists.txt b/packages/muelu/test/unit_tests/CMakeLists.txt
index 1943e25aea26..cd4bc0fffbee 100644
--- a/packages/muelu/test/unit_tests/CMakeLists.txt
+++ b/packages/muelu/test/unit_tests/CMakeLists.txt
@@ -139,16 +139,14 @@ ENDIF()
 ### Tests that require other Trilinos packages
 
 # first ensure that these cmake boolean variables are defined
-ASSERT_DEFINED(
-  ${PACKAGE_NAME}_ENABLE_Amesos
-  ${PACKAGE_NAME}_ENABLE_Amesos2
-  ${PACKAGE_NAME}_ENABLE_Ifpack
-  ${PACKAGE_NAME}_ENABLE_Ifpack2
-  ${PACKAGE_NAME}_ENABLE_Epetra
-  ${PACKAGE_NAME}_ENABLE_EpetraExt
-  ${PACKAGE_NAME}_ENABLE_Belos
-  ${PACKAGE_NAME}_ENABLE_Zoltan
-)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos2)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Ifpack)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Ifpack2)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Epetra)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_EpetraExt)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Belos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Zoltan)
 APPEND_SET(SOURCES Adapters/TpetraOperatorAdapter.cpp)
 
 IF(${PACKAGE_NAME}_ENABLE_Ifpack2)
diff --git a/packages/muelu/test/unit_tests_kokkos/CMakeLists.txt b/packages/muelu/test/unit_tests_kokkos/CMakeLists.txt
index 2716a68205d2..d06a10090cdc 100644
--- a/packages/muelu/test/unit_tests_kokkos/CMakeLists.txt
+++ b/packages/muelu/test/unit_tests_kokkos/CMakeLists.txt
@@ -43,12 +43,10 @@ APPEND_SET(SOURCES Galeri.cpp)
 ### Tests that require other Trilinos packages
 
 # First ensure that these cmake boolean variables are defined
-ASSERT_DEFINED(
-  ${PACKAGE_NAME}_ENABLE_Amesos2
-  ${PACKAGE_NAME}_ENABLE_Ifpack2
-  ${PACKAGE_NAME}_ENABLE_Belos
-  ${PACKAGE_NAME}_ENABLE_Zoltan
-)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos2)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Ifpack2)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Belos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Zoltan)
 
 TRIBITS_ADD_EXECUTABLE(
   UnitTests_kokkos
diff --git a/packages/muelu/test/viz/CMakeLists.txt b/packages/muelu/test/viz/CMakeLists.txt
index 5ba0b8b84e17..b96c5bd1685f 100644
--- a/packages/muelu/test/viz/CMakeLists.txt
+++ b/packages/muelu/test/viz/CMakeLists.txt
@@ -1,10 +1,8 @@
 # Ensure that these cmake boolean variables are defined
-ASSERT_DEFINED(
-  ${PACKAGE_NAME}_ENABLE_Amesos
-  ${PACKAGE_NAME}_ENABLE_Amesos2
-  ${PACKAGE_NAME}_ENABLE_Belos
-  ${PACKAGE_NAME}_ENABLE_Epetra
-)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Amesos2)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Belos)
+ASSERT_DEFINED(${PACKAGE_NAME}_ENABLE_Epetra)
 
 #
 # Executable
diff --git a/packages/nox/test/epetra/Thyra/CMakeLists.txt b/packages/nox/test/epetra/Thyra/CMakeLists.txt
index eae4ee012935..67cda2fb7656 100644
--- a/packages/nox/test/epetra/Thyra/CMakeLists.txt
+++ b/packages/nox/test/epetra/Thyra/CMakeLists.txt
@@ -4,9 +4,9 @@ TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../utils)
 
-ASSERT_DEFINED(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA
-  NOX_ENABLE_Epetra NOX_ENABLE_EpetraExt
-  NOX_ENABLE_Stratimikos Stratimikos_ENABLE_AztecOO)
+ASSERT_DEFINED(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA)
+ASSERT_DEFINED(NOX_ENABLE_Epetra NOX_ENABLE_EpetraExt)
+ASSERT_DEFINED(NOX_ENABLE_Stratimikos Stratimikos_ENABLE_AztecOO)
 
 SET(UNIT_TEST_DRIVER ${TEUCHOS_STD_UNIT_TEST_MAIN})
 
diff --git a/packages/nox/test/thyra-tpetra/CMakeLists.txt b/packages/nox/test/thyra-tpetra/CMakeLists.txt
index 27b726c54551..51e6ae884990 100644
--- a/packages/nox/test/thyra-tpetra/CMakeLists.txt
+++ b/packages/nox/test/thyra-tpetra/CMakeLists.txt
@@ -1,10 +1,10 @@
 
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
-ASSERT_DEFINED(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA
-  NOX_ENABLE_Tpetra
-  NOX_ENABLE_Stratimikos
-  Stratimikos_ENABLE_Belos)
+ASSERT_DEFINED(NOX_ENABLE_ABSTRACT_IMPLEMENTATION_THYRA)
+ASSERT_DEFINED(NOX_ENABLE_Tpetra)
+ASSERT_DEFINED(NOX_ENABLE_Stratimikos)
+ASSERT_DEFINED(Stratimikos_ENABLE_Belos)
 
 SET(UNIT_TEST_DRIVER UnitTestMainWithKokkos.cpp)
 
diff --git a/packages/stk/stk_unit_tests/stk_util/CMakeLists.txt b/packages/stk/stk_unit_tests/stk_util/CMakeLists.txt
index aa1a2283ba9d..dd7102d32328 100644
--- a/packages/stk/stk_unit_tests/stk_util/CMakeLists.txt
+++ b/packages/stk/stk_unit_tests/stk_util/CMakeLists.txt
@@ -33,7 +33,8 @@
 #
 
 if(HAVE_STK_Trilinos)
-ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
+ASSERT_DEFINED(PACKAGE_SOURCE_DIR)
+ASSERT_DEFINED(CMAKE_CURRENT_SOURCE_DIR)
 endif()
 
 FILE(GLOB SOURCES CONFIGURE_DEPENDS *.cpp
diff --git a/packages/stokhos/test/Performance/CuspAMG/CMakeLists.txt b/packages/stokhos/test/Performance/CuspAMG/CMakeLists.txt
index a118796c6c25..baafee2308c6 100644
--- a/packages/stokhos/test/Performance/CuspAMG/CMakeLists.txt
+++ b/packages/stokhos/test/Performance/CuspAMG/CMakeLists.txt
@@ -1,5 +1,6 @@
 
-ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
+ASSERT_DEFINED(PACKAGE_SOURCE_DIR)
+ASSERT_DEFINED(CMAKE_CURRENT_SOURCE_DIR)
 
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/packages/stokhos/test/Performance/KokkosArraySPMVKernels/CMakeLists.txt b/packages/stokhos/test/Performance/KokkosArraySPMVKernels/CMakeLists.txt
index 8073696502df..bbb03459efe0 100644
--- a/packages/stokhos/test/Performance/KokkosArraySPMVKernels/CMakeLists.txt
+++ b/packages/stokhos/test/Performance/KokkosArraySPMVKernels/CMakeLists.txt
@@ -1,4 +1,5 @@
-ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
+ASSERT_DEFINED(PACKAGE_SOURCE_DIR)
+ASSERT_DEFINED(CMAKE_CURRENT_SOURCE_DIR)
 
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/packages/stokhos/test/Performance/KokkosSpMM/CMakeLists.txt b/packages/stokhos/test/Performance/KokkosSpMM/CMakeLists.txt
index c8123d9a32d7..bb06e97846c2 100644
--- a/packages/stokhos/test/Performance/KokkosSpMM/CMakeLists.txt
+++ b/packages/stokhos/test/Performance/KokkosSpMM/CMakeLists.txt
@@ -1,5 +1,6 @@
 
-ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
+ASSERT_DEFINED(PACKAGE_SOURCE_DIR)
+ASSERT_DEFINED(CMAKE_CURRENT_SOURCE_DIR)
 
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/packages/stokhos/test/Performance/MPAssembly/CMakeLists.txt b/packages/stokhos/test/Performance/MPAssembly/CMakeLists.txt
index 03dcdc0984e8..6b2223ff8a5b 100644
--- a/packages/stokhos/test/Performance/MPAssembly/CMakeLists.txt
+++ b/packages/stokhos/test/Performance/MPAssembly/CMakeLists.txt
@@ -1,4 +1,5 @@
-ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
+ASSERT_DEFINED(PACKAGE_SOURCE_DIR)
+ASSERT_DEFINED(CMAKE_CURRENT_SOURCE_DIR)
 
 TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/packages/stokhos/test/Performance/PCEMeanMultiply/CMakeLists.txt b/packages/stokhos/test/Performance/PCEMeanMultiply/CMakeLists.txt
index 2d315ac5c2d3..5fe3a2f9bde5 100644
--- a/packages/stokhos/test/Performance/PCEMeanMultiply/CMakeLists.txt
+++ b/packages/stokhos/test/Performance/PCEMeanMultiply/CMakeLists.txt
@@ -1,5 +1,6 @@
 
-ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
+ASSERT_DEFINED(PACKAGE_SOURCE_DIR)
+ASSERT_DEFINED(CMAKE_CURRENT_SOURCE_DIR)
 
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/packages/stokhos/test/UnitTest/CMakeLists.txt b/packages/stokhos/test/UnitTest/CMakeLists.txt
index 319b489bf239..7ce738b730f3 100644
--- a/packages/stokhos/test/UnitTest/CMakeLists.txt
+++ b/packages/stokhos/test/UnitTest/CMakeLists.txt
@@ -1,4 +1,5 @@
-ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
+ASSERT_DEFINED(PACKAGE_SOURCE_DIR)
+ASSERT_DEFINED(CMAKE_CURRENT_SOURCE_DIR)
 
 # Unit test static library containing 'int main' that initializes:
 #   - Teuchos MPI Comm
diff --git a/packages/thyra/adapters/tpetra/CMakeLists.txt b/packages/thyra/adapters/tpetra/CMakeLists.txt
index 43016f219f4d..9be0025af527 100644
--- a/packages/thyra/adapters/tpetra/CMakeLists.txt
+++ b/packages/thyra/adapters/tpetra/CMakeLists.txt
@@ -1,15 +1,13 @@
 
 TRIBITS_SUBPACKAGE(TpetraAdapters)
 
-ASSERT_DEFINED(
-  Thyra_ENABLE_EXPLICIT_INSTANTIATION
-  Tpetra_INST_FLOAT
-  Tpetra_INST_COMPLEX_DOUBLE
-  Tpetra_INST_COMPLEX_FLOAT
-  Teuchos_INST_FLOAT
-  Teuchos_INST_COMPLEX_DOUBLE
-  Teuchos_INST_COMPLEX_FLOAT
-)
+ASSERT_DEFINED(Thyra_ENABLE_EXPLICIT_INSTANTIATION)
+ASSERT_DEFINED(Tpetra_INST_FLOAT)
+ASSERT_DEFINED(Tpetra_INST_COMPLEX_DOUBLE)
+ASSERT_DEFINED(Tpetra_INST_COMPLEX_FLOAT)
+ASSERT_DEFINED(Teuchos_INST_FLOAT)
+ASSERT_DEFINED(Teuchos_INST_COMPLEX_DOUBLE)
+ASSERT_DEFINED(Teuchos_INST_COMPLEX_FLOAT)
 
 IF (Thyra_ENABLE_EXPLICIT_INSTANTIATION)
 
diff --git a/packages/trilinoscouplings/src/CMakeLists.txt b/packages/trilinoscouplings/src/CMakeLists.txt
index 310c49fa7137..01c41ef3f49d 100644
--- a/packages/trilinoscouplings/src/CMakeLists.txt
+++ b/packages/trilinoscouplings/src/CMakeLists.txt
@@ -31,10 +31,8 @@ IF(HAVE_TRILINOSCOUPLINGS_ISORROPIA)
  SET(HAVE_ISORROPIA ON)
 ENDIF()
 
-ASSERT_DEFINED(
-  HAVE_TRILINOSCOUPLINGS_TPETRA
-  HAVE_TRILINOSCOUPLINGS_ZOLTAN2CORE
-)
+ASSERT_DEFINED(HAVE_TRILINOSCOUPLINGS_TPETRA)
+ASSERT_DEFINED(HAVE_TRILINOSCOUPLINGS_ZOLTAN2CORE)
 
 TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h)