Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions packages/PyTrilinos2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)

###################################################################################################

Expand Down
12 changes: 4 additions & 8 deletions packages/ifpack2/example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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})
Expand Down
12 changes: 5 additions & 7 deletions packages/muelu/doc/Tutorial/src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 5 additions & 7 deletions packages/muelu/test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
10 changes: 4 additions & 6 deletions packages/muelu/test/convergence/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
12 changes: 5 additions & 7 deletions packages/muelu/test/helmholtz/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
12 changes: 5 additions & 7 deletions packages/muelu/test/interface/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 4 additions & 6 deletions packages/muelu/test/longlong/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion packages/muelu/test/maxwell/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 3 additions & 1 deletion packages/muelu/test/navierstokes/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 8 additions & 12 deletions packages/muelu/test/scaling/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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)

Expand Down
4 changes: 2 additions & 2 deletions packages/muelu/test/simple1D/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion packages/muelu/test/structured/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 3 additions & 1 deletion packages/muelu/test/tutorial/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 8 additions & 10 deletions packages/muelu/test/unit_tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 4 additions & 6 deletions packages/muelu/test/unit_tests_kokkos/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions packages/muelu/test/viz/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions packages/nox/test/epetra/Thyra/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Comment on lines +8 to +9
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The pull request description states that ASSERT_DEFINED only asserts the first variable. However, these lines still contain multiple arguments, meaning NOX_ENABLE_EpetraExt and Stratimikos_ENABLE_AztecOO will not be checked. These should be split into individual calls to ensure all variables are properly asserted.

ASSERT_DEFINED(NOX_ENABLE_Epetra)
ASSERT_DEFINED(NOX_ENABLE_EpetraExt)
ASSERT_DEFINED(NOX_ENABLE_Stratimikos)
ASSERT_DEFINED(Stratimikos_ENABLE_AztecOO)


SET(UNIT_TEST_DRIVER ${TEUCHOS_STD_UNIT_TEST_MAIN})

Expand Down
8 changes: 4 additions & 4 deletions packages/nox/test/thyra-tpetra/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
3 changes: 2 additions & 1 deletion packages/stk/stk_unit_tests/stk_util/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion packages/stokhos/test/Performance/CuspAMG/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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})
Expand Down
Original file line number Diff line number Diff line change
@@ -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})
Expand Down
3 changes: 2 additions & 1 deletion packages/stokhos/test/Performance/KokkosSpMM/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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})
Expand Down
3 changes: 2 additions & 1 deletion packages/stokhos/test/Performance/MPAssembly/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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})
Expand Down
Original file line number Diff line number Diff line change
@@ -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})
Expand Down
3 changes: 2 additions & 1 deletion packages/stokhos/test/UnitTest/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 7 additions & 9 deletions packages/thyra/adapters/tpetra/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
Loading
Loading