diff --git a/packages/compadre/CMakeLists.txt b/packages/compadre/CMakeLists.txt
index cd7a2f3f8690..61ea762d685d 100644
--- a/packages/compadre/CMakeLists.txt
+++ b/packages/compadre/CMakeLists.txt
@@ -1,556 +1,556 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.16.0 FATAL_ERROR)
-
-# get Compadre_VERSION
-file(STRINGS ${CMAKE_CURRENT_LIST_DIR}/cmake/Compadre_Version.txt Compadre_VERSION)
-
-# Called at the top of every CMakeLists.txt file
-macro(include_tribits_build)
-  if (${PROJECT_NAME}_TRIBITS_DIR)
-    include("${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.tribits.cmake")
-    return()
-  endif()
-endmacro()
-
-# cmake helper functions
-include(${CMAKE_CURRENT_LIST_DIR}/cmake/bob.cmake)
-
-if (${PROJECT_NAME}_TRIBITS_DIR) # TriBITS CMake Project
-
-  #
-  # A) Define the package
-  #
-
-  tribits_package(Compadre)
-
-  #
-  # B) Set up package-specific options
-  #
-  TRIBITS_ADD_OPTION_AND_DEFINE(${PACKAGE_NAME}_ENABLE_DEBUG
-      Compadre_DEBUG
-      "Enable debug code in compadre"
-      ${Trilinos_ENABLE_DEBUG} )
-
-  TRIBITS_ADD_OPTION_AND_DEFINE(${PACKAGE_NAME}_ENABLE_EXTREME_DEBUG
-      Compadre_EXTREME_DEBUG
-      "Enable extreme debug code in compadre"
-      OFF )
-
-  if ("${TPL_ENABLE_CUDA}" STREQUAL "ON")
-      set(Compadre_USE_CUDA   ON  CACHE BOOL "Whether to use CUDA")
-  else ()
-      set(Compadre_USE_CUDA   OFF CACHE BOOL "Whether to use CUDA")
-  endif()
-
-  set(Compadre_USE_MATLAB OFF CACHE BOOL "Don't use Matlab when building in Trilinos")
-  set(Compadre_USE_MPI ${TPL_ENABLE_MPI} CACHE BOOL "Use MPI for parallelism")
-  set(Compadre_USE_PYTHON OFF CACHE BOOL "Don't use Python when building in Trilinos")
-
-  # breakdown Compadre_VERSION from Version.cmake for storage in Compadre_Config.h
-  string(REPLACE "." ";" VLIST ${Compadre_VERSION})
-  list(GET VLIST 0 Compadre_VERSION_MAJOR)
-  list(GET VLIST 1 Compadre_VERSION_MINOR)
-  list(GET VLIST 2 Compadre_VERSION_PATCH)
-
-else() # Raw CMake Project
-
-  ##########
-  #
-  #   Compadre Details
-  #
-  ########## 
-
-  # Disable in-source builds to prevent source tree corruption.
-  if( "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}" )
-    message( FATAL_ERROR "FATAL: In-source builds are not allowed. You should create a separate directory for build files and delete CMakeCache.txt." )
-  endif()
-
-  PROJECT(Compadre VERSION ${Compadre_VERSION} LANGUAGES CXX)
-  if (NOT CMAKE_CXX_STANDARD)
-      set(CMAKE_CXX_STANDARD 17)
-  endif()
-  set(CMAKE_DISABLE_SOURCE_CHANGES ON)
-  set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
-  set(CMAKE_POLICY_DEFAULT_CMP0128 OLD)
-  set(CMAKE_CXX_EXTENSIONS OFF)
-
-  get_directory_property(Compadre_HAS_PARENT PARENT_DIRECTORY)
-
-  if (NOT Compadre_HAS_PARENT)
-    include(GNUInstallDirs)
-  endif()
-
-  bob_begin_package()
-
-  # Set to OFF for significantly faster performance and ON for error tracking
-  bob_option(Compadre_EXTREME_DEBUG "Run Compadre Toolkit in EXTREME DEBUG mode" OFF)
-  bob_option(Compadre_DEBUG "Run Compadre Toolkit in DEBUG mode" ON)
-  if (Compadre_EXTREME_DEBUG)
-    set(Compadre_DEBUG ON)
-    message(STATUS "Compadre_DEBUG: ON (because Compadre_EXTREME_DEBUG is ON)")
-  endif()
-
-  # RPATH related settings
-  # https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/RPATH-handling
-  SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
-  SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-  SET(CMAKE_INSTALL_RPATH "../${CMAKE_INSTALL_LIBDIR}")
-
-  # RPATH should always include the folder it is called from
-  bob_option(PYTHON_CALLING_BUILD "Python setuptools calling build" OFF)
-  bob_option(Compadre_USE_PYTHON "Use PYTHON" OFF)
-  bob_option(Compadre_USE_MATLAB "Use MATLAB interface for PYTHON" OFF)
-  bob_option(Compadre_USE_MPI "Use MPI (not needed for Compadre toolkit)" OFF)
-  set(PYTHON_LIBRARY_PREFIX "..") # relative to examples folder
-  bob_input(Python3_EXECUTABLE "" PATH "Python executable location")
-  IF(NOT(Python3_EXECUTABLE))
-    MESSAGE(STATUS "Python executable location Python3_EXECUTABLE not given. Search made using 'which python'")
-    EXECUTE_PROCESS(
-      COMMAND which "python"
-      OUTPUT_VARIABLE Python3_EXECUTABLE
-      OUTPUT_STRIP_TRAILING_WHITESPACE )
-  ENDIF()
-  MESSAGE(STATUS "Python3_EXECUTABLE: ${Python3_EXECUTABLE}")
-  if (Compadre_USE_PYTHON)
-    # change RPATH for a flat directory structure
-    # when installing pycompadre as Python package
-    if (PYTHON_CALLING_BUILD)
-      if (APPLE)
-        SET(CMAKE_BUILD_RPATH ${CMAKE_BUILD_RPATH} "@loader_path/")
-        SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} "@loader_path/")
-      else()
-        SET(CMAKE_BUILD_RPATH ${CMAKE_BUILD_RPATH} "$ORIGIN/")
-        SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} "$ORIGIN/")
-        SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,origin")
-      endif()
-    endif()
-  endif()
-
-
-
-  ##########
-  #
-  #
-  #  TPLS
-  #
-  #  Three choices for providing TPLs:
-  #
-  #      a.) None
-  #          - Trilinos_PREFIX, KokkosCore_PREFIX, and KokkosKernels_PREFIX 
-  #            not specified
-  #      b.) Trilinos installation with Kokkos AND KokkosKernels
-  #          - Trilinos_PREFIX specified
-  #      c.) Kokkos AND KokkosKernels standalone installations
-  #          - KokkosCore_PREFIX and KokkosKernels_PREFIX specified
-  #
-  #  For option a, vendored Kokkos and KokkosKernels built for user
-  #
-  ##########
-
-
-
-  #TRILINOS
-  bob_input(Trilinos_PREFIX "" PATH "Path to Trilinos install")
-  if (Trilinos_PREFIX)
-    if(NOT IS_ABSOLUTE ${Trilinos_PREFIX})
-      set(Trilinos_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/${Trilinos_PREFIX}")
-    endif()
-    set(CMAKE_PREFIX_PATH ${Trilinos_PREFIX} ${CMAKE_PREFIX_PATH})
-  endif()
-
-  #KOKKOS
-  bob_input(KokkosCore_PREFIX "" PATH "Path to KokkosCore install")
-  if (KokkosCore_PREFIX)
-    if(NOT IS_ABSOLUTE ${KokkosCore_PREFIX})
-      set(KokkosCore_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/${KokkosCore_PREFIX}")
-    endif()
-    set(CMAKE_PREFIX_PATH ${KokkosCore_PREFIX} ${CMAKE_PREFIX_PATH})
-  endif()
-
-  #KOKKOS-KERNELS
-  bob_input(KokkosKernels_PREFIX "" PATH "Path to KokkosKernels install")
-  if (KokkosKernels_PREFIX)
-    if(NOT IS_ABSOLUTE ${KokkosKernels_PREFIX})
-      set(KokkosKernels_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/${KokkosKernels_PREFIX}")
-    endif()
-    set(CMAKE_PREFIX_PATH ${KokkosKernels_PREFIX} ${CMAKE_PREFIX_PATH})
-  endif()
-  set(KOKKOS_IN_TRILINOS OFF)
-  set(KOKKOS_EXISTING_ELSEWHERE OFF)
-  set(KOKKOS_BUILT_FOR_USER OFF)
-  set(KOKKOSKERNELS_IN_TRILINOS OFF)
-  set(KOKKOSKERNELS_EXISTING_ELSEWHERE OFF)
-  set(KOKKOSKERNELS_BUILT_FOR_USER OFF)
-  set(KOKKOS_MIN "3.3.01")
-
-  if (Trilinos_PREFIX)
-    FIND_PACKAGE(Trilinos COMPONENTS Kokkos KokkosKernels OPTIONAL_COMPONENTS Gtest)
-
-    LIST(REVERSE Trilinos_INCLUDE_DIRS)
-    LIST(REMOVE_DUPLICATES Trilinos_INCLUDE_DIRS)
-    LIST(REVERSE Trilinos_INCLUDE_DIRS)
-
-    LIST(REVERSE Trilinos_LIBRARIES)
-    LIST(REMOVE_DUPLICATES Trilinos_LIBRARIES)
-    LIST(REVERSE Trilinos_LIBRARIES)
-    
-    LIST(REVERSE Trilinos_TPL_LIBRARIES)
-    LIST(REMOVE_DUPLICATES Trilinos_TPL_LIBRARIES)
-    LIST(REVERSE Trilinos_TPL_LIBRARIES)
-    
-    MESSAGE("\nFound Trilinos!  Here are the details: ")
-    MESSAGE("   Trilinos_DIR = ${Trilinos_DIR}")
-    MESSAGE("   Trilinos_VERSION = ${Trilinos_VERSION}")
-    MESSAGE("   Trilinos_PACKAGE_LIST = ${Trilinos_PACKAGE_LIST}")
-    MESSAGE("   Trilinos_LIBRARIES = ${Trilinos_LIBRARIES}")
-    MESSAGE("   Trilinos_BIN_DIRS = ${Trilinos_BIN_DIRS}")
-    MESSAGE("   Trilinos_INCLUDE_DIRS = ${Trilinos_INCLUDE_DIRS}")
-    MESSAGE("   Trilinos_LIBRARY_DIRS = ${Trilinos_LIBRARY_DIRS}")
-    MESSAGE("   Trilinos_TPL_LIST = ${Trilinos_TPL_LIST}")
-    MESSAGE("   Trilinos_TPL_INCLUDE_DIRS = ${Trilinos_TPL_INCLUDE_DIRS}")
-    MESSAGE("   Trilinos_TPL_LIBRARIES = ${Trilinos_TPL_LIBRARIES}")
-    MESSAGE("   Trilinos_TPL_LIBRARY_DIRS = ${Trilinos_TPL_LIBRARY_DIRS}")
-    MESSAGE("   Trilinos_BUILD_SHARED_LIBS = ${Trilinos_BUILD_SHARED_LIBS}")
-    MESSAGE("   Trilinos_CXX_COMPILER_FLAGS = ${Trilinos_CXX_COMPILER_FLAGS}")
-    MESSAGE("End of Trilinos details\n")
-    
-    LIST(REVERSE Trilinos_INCLUDE_DIRS)
-    LIST(REMOVE_DUPLICATES Trilinos_INCLUDE_DIRS)
-    LIST(REVERSE Trilinos_INCLUDE_DIRS)
-    MESSAGE("   Trilinos_INCLUDE_DIRS = ${Trilinos_INCLUDE_DIRS}")
-    MESSAGE("   Trilinos_CXX_FLAGS = ${Trilinos_CXX_COMPILER_FLAGS}")
-
-    IF (Trilinos_VERSION VERSION_GREATER_EQUAL "14.1")
-        set(CompadreKokkosPackageName "Kokkos")
-    ELSE ()
-        set(CompadreKokkosPackageName "KokkosCore")
-    ENDIF()
-    LIST(FIND Trilinos_PACKAGE_LIST ${CompadreKokkosPackageName} ${CompadreKokkosPackageName}ID)
-    IF (${CompadreKokkosPackageName}ID GREATER -1 )
-      MESSAGE(STATUS "Found ${CompadreKokkosPackageName} inside Trilinos!")
-      set(KOKKOS_IN_TRILINOS ON)
-    ELSE()
-      MESSAGE(FATAL_ERROR "Found Trilinos but could not find ${CompadreKokkosPackageName}.")
-    ENDIF()
-
-    LIST(FIND Trilinos_PACKAGE_LIST KokkosKernels KokkosKernelsID)
-    IF (KokkosKernelsID GREATER -1 )
-      MESSAGE(STATUS "Found KokkosKernels inside Trilinos!")
-      set(KOKKOSKERNELS_IN_TRILINOS ON)
-      set(KokkosKernels_FOUND ON)
-    ELSE()
-      MESSAGE(FATAL_ERROR "Found Trilinos but could not find KokkosKernels.")
-    ENDIF()
-
-    LIST(FIND Trilinos_PACKAGE_LIST Gtest GtestID)
-
-    if(KOKKOS_IN_TRILINOS AND NOT(KOKKOSKERNELS_IN_TRILINOS))
-        MESSAGE(FATAL_ERROR "Kokkos found in Trilinos, but not KokkosKernels")
-    endif()
-
-    # Check that CUDA_LAMBDA is enabled if using CUDA in Kokkos
-    list(FIND Kokkos_DEVICES CUDA cuda_index)
-    if (NOT cuda_index EQUAL -1)
-      list(FIND Kokkos_OPTIONS CUDA_LAMBDA cuda_lambda_index)
-      if (cuda_lambda_index EQUAL -1)
-        message(FATAL_ERROR "Please reconfigure Trilinos with -DKokkos_ENABLE_CUDA_LAMBDA:BOOL=ON")
-      endif()
-      set(Compadre_USE_CUDA ON)
-    endif()
-
-    FIND_PACKAGE(Kokkos)
-    message(STATUS "Kokkos Version: ${Kokkos_VERSION}")
-    if (Kokkos_VERSION VERSION_LESS "${KOKKOS_MIN}")
-        message(FATAL_ERROR "${Kokkos_VERSION}: Requires Trilinos with Kokkos version ${KOKKOS_MIN} or greater")
-    endif()
-
-  ENDIF()
-
-  if (NOT KOKKOS_IN_TRILINOS)
-    if (KokkosCore_PREFIX STREQUAL "")
-      SET(KOKKOS_BUILT_FOR_USER ON)
-      if (APPLE)
-        bob_option(Kokkos_ENABLE_CUDA "Whether to use CUDA" OFF)
-        bob_option(Kokkos_ENABLE_OPENMP "Whether to use OPENMP" OFF)
-        bob_option(Kokkos_ENABLE_THREADS "Whether to use THREADS" ON)
-      else()
-        bob_option(Kokkos_ENABLE_CUDA "Whether to use CUDA" OFF)
-        bob_option(Kokkos_ENABLE_OPENMP "Whether to use OPENMP" ON)
-        bob_option(Kokkos_ENABLE_THREADS "Whether to use THREADS" OFF)
-      endif()
-      option(Kokkos_ENABLE_DEBUG "" "${Compadre_DEBUG}")
-      option(Kokkos_ENABLE_CUDA_UVM "" OFF)
-      option(Kokkos_ENABLE_DEBUG_BOUNDS_CHECK "" "${Compadre_EXTREME_DEBUG}")
-      option(Kokkos_ENABLE_CUDA_LAMBDA "" "${Kokkos_ENABLE_CUDA}")
-      option(Kokkos_ENABLE_TESTS "" OFF)
-      option(Kokkos_ENABLE_EXAMPLES "" OFF)
-      if (NOT(KokkosKernels_PREFIX STREQUAL ""))
-          MESSAGE(FATAL_ERROR "KokkosKernels_PREFIX specified but KokkosCore_PREFIX not specified. \
-          Either provide KokkosCore_PREFIX as well, or remove KokkosKernels_PREFIX specification.")
-      endif()
-      # older version of Kokkos shipped with Compadre still uses PTHREAD naming
-      set(Kokkos_ENABLE_PTHREAD ${Kokkos_ENABLE_THREADS}) 
-      # set Compadre_USE_ to use whatever Kokkos_ENABLE_ specified, since user is building Kokkos
-      set(Compadre_USE_CUDA ${Kokkos_ENABLE_CUDA})
-      set(Kokkos_PREFIX ${CMAKE_INSTALL_PREFIX})
-    else()
-      # Existing KokkosCore indicated by user by setting KokkosCore_PREFIX, so we look for it
-      # where specified (only)
-      find_package(Kokkos PATHS "${KokkosCore_PREFIX}" NO_DEFAULT_PATH REQUIRED)
-      message(STATUS "Kokkos Version: ${Kokkos_VERSION}")
-      if (Kokkos_VERSION VERSION_LESS "${KOKKOS_MIN}")
-          message(FATAL_ERROR "${Kokkos_VERSION}: Requires Kokkos version ${KOKKOS_MIN} or greater")
-      endif()
-      set(KOKKOS_EXISTING_ELSEWHERE ON)
-      # set Compadre_USE_ to whatever is enabled in Kokkos build
-      if (TARGET Kokkos::CUDA)
-        set(Compadre_USE_CUDA ON)
-      endif()
-      set(Kokkos_PREFIX "${KokkosCore_PREFIX}")
-    endif()
-  endif()
-  message(STATUS "Compadre_USE_CUDA: ${Compadre_USE_CUDA}")
-
-  option(Kokkos_CXX_STANDARD "" "${CMAKE_CXX_STANDARD}")
-
-  if (NOT(KOKKOS_IN_TRILINOS) AND (KokkosCore_PREFIX STREQUAL ""))
-      add_subdirectory(kokkos)
-      get_directory_property(Kokkos_VERSION DIRECTORY kokkos DEFINITION Kokkos_VERSION)
-      message(STATUS "Kokkos Version: ${Kokkos_VERSION}")
-  endif()
-  if(Kokkos_VERSION VERSION_LESS "3.7")
-    set(KOKKOS_THREADS_ARG "--kokkos-threads")
-  else()
-    set(KOKKOS_THREADS_ARG "--kokkos-num-threads")
-  endif()
-
-  if (KOKKOSKERNELS_IN_TRILINOS)
-    if (Compadre_USE_CUDA)
-      list(FIND Trilinos_TPL_LIST "CUDA" CUDAID)
-      if (NOT(CUDAID GREATER -1))
-          MESSAGE(FATAL_ERROR "Compadre_USE_CUDA set to ON, but CUDA not defined in Trilinos")
-      endif()
-    endif()
-    # register Trilinos so that it shows up in CompadreConfig.cmake
-    set(Compadre_EXT_DEPS Trilinos)
-  else()
-    if (KokkosKernels_PREFIX STREQUAL "")
-      SET(KOKKOSKERNELS_BUILT_FOR_USER ON)
-      # both are required to be sure it finds it
-      SET(KokkosKernels_ENABLE_EXAMPLES OFF)
-      SET(KokkosKernels_ENABLE_TESTS OFF)
-      OPTION(KokkosKernels_ETI_ONLY "" OFF)
-      SET(KokkosKernels_ETI_ONLY OFF)
-      OPTION(KokkosKernels_INST_OFFSET_SIZE_T "" OFF)
-      SET(KokkosKernels_INST_OFFSET_SIZE_T OFF)
-      OPTION(KokkosKernels_INST_OFFSET_INT "" OFF)
-      SET(KokkosKernels_INST_OFFSET_INT OFF)
-      OPTION(KokkosKernels_INST_LAYOUTLEFT "" OFF)
-      SET(KokkosKernels_INST_LAYOUTLEFT OFF)
-      OPTION(KokkosKernels_INST_LAYOUTRIGHT "" OFF)
-      SET(KokkosKernels_INST_LAYOUTRIGHT OFF)
-      OPTION(KokkosKernels_INST_DOUBLE "" OFF)
-      SET(KokkosKernels_INST_DOUBLE OFF)
-      OPTION(KokkosKernels_INST_ORDINAL_INT "" OFF)
-      SET(KokkosKernels_INST_ORDINAL_INT OFF)
-      OPTION(KokkosKernels_ENABLE_TPL_CUBLAS "" OFF)
-      SET(KokkosKernels_ENABLE_TPL_CUBLAS OFF)
-      OPTION(KokkosKernels_ENABLE_TPL_CUSPARSE "" OFF)
-      SET(KokkosKernels_ENABLE_TPL_CUSPARSE OFF)
-      OPTION(KokkosKernels_INST_MEMSPACE_CUDAUVMSPACE "" OFF)
-      SET(KokkosKernels_INST_MEMSPACE_CUDAUVMSPACE OFF)
-      OPTION(KokkosKernels_INST_EXECSPACE_THREADS "" ${Kokkos_ENABLE_THREADS})
-      SET(KokkosKernels_INST_EXECSPACE_THREADS ${Kokkos_ENABLE_THREADS})
-      OPTION(KokkosKernels_INST_EXECSPACE_OPENMP "" ${Kokkos_ENABLE_OPENMP})
-      SET(KokkosKernels_INST_EXECSPACE_OPENMP ${Kokkos_ENABLE_OPENMP})
-      add_subdirectory(kokkos-kernels)
-      if (NOT(KokkosCore_PREFIX STREQUAL ""))
-          MESSAGE(FATAL_ERROR "KokkosCore_PREFIX specified but KokkosKernels_PREFIX not specified. \
-          Either provide KokkosKernels_PREFIX as well, or remove KokkosCore_PREFIX specification.")
-      endif()
-      set(KokkosKernels_PREFIX ${CMAKE_INSTALL_PREFIX})
-    else()
-      # Existing KokkosCore indicated by user by setting KokkosCore_PREFIX, so we look for it
-      # where specified (only)
-      find_package(KokkosKernels PATHS "${KokkosKernels_PREFIX}" NO_DEFAULT_PATH REQUIRED)
-      if(Compadre_USE_CUDA AND NOT(TARGET Kokkos::CUDA))
-        MESSAGE(FATAL_ERROR "Compadre_USE_CUDA set to ON, but Kokkos::CUDA not defined")
-      endif()
-      set(KOKKOSKERNELS_EXISTING_ELSEWHERE ON)
-    endif()
-    # register Kokkos and KokkosKernels so that they show up in CompadreConfig.cmake
-    set(Compadre_EXT_DEPS Kokkos KokkosKernels)
-  endif()
-
-
-
-  #MPI (Not really needed, only used so that if a kokkos-tool was built with MPI, it won't segfault)
-  if (Compadre_USE_MPI)
-    FIND_PACKAGE(MPI QUIET)
-    bob_option(Compadre_USE_MPI "Use MPI for parallelism" ${MPI_CXX_FOUND})
-    message(STATUS "MPI Enabled: ${MPI_CXX_FOUND}")
-    if (MPI_CXX_FOUND)
-        MESSAGE(STATUS "MPI_CXX_INCLUDE_PATH: ${MPI_CXX_INCLUDE_PATH}")
-        MESSAGE(STATUS "MPI_CXX_LIBRARIES: ${MPI_CXX_LIBRARIES}")
-    endif()
-  endif (Compadre_USE_MPI)
-
-
-
-  ##########
-  #
-  #
-  #  OPTIONS
-  #
-  #
-  ##########
-
-
-
-  bob_option(Compadre_TESTS "Compile Compadre tests" ON)
-  bob_option(Compadre_EXAMPLES "Compile Compadre examples" "${Compadre_TESTS}")
-  bob_option(Compadre_COVERAGE "Use code coverage" OFF)
-
-
-endif() 
-
-##########
-#
-#
-#  PREPROCESSOR DEFINES FOR USE WHEN BUILDING CODE
-#
-#
-##########
-
-
-set(Compadre_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-set(Compadre_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-
-set(Compadre_KEY_BOOLS
-    Compadre_DEBUG
-    Compadre_EXTREME_DEBUG
-    Compadre_USE_CUDA
-    Compadre_USE_MPI
-    Compadre_USE_PYTHON
-    PYTHON_CALLING_BUILD
-   )
-
-set(Compadre_KEY_INTS
-    Compadre_VERSION_MAJOR
-    Compadre_VERSION_MINOR
-    Compadre_VERSION_PATCH
-   )
-
-set(Compadre_KEY_STRINGS
-    Compadre_SEMVER
-    Compadre_COMMIT
-    Compadre_CXX_FLAGS
-    Compadre_CMAKE_ARGS
-    Compadre_INSTALL_PREFIX
-)
-
-if (${PROJECT_NAME}_TRIBITS_DIR) # TriBITS CMake Project
-
-  #
-  # C) Add the libraries, tests, and examples
-  #
-
-  add_subdirectory(src)
-  tribits_add_test_directories(examples)
-
-  #
-  # D) Do standard postprocessing
-  #
-
-  tribits_package_postprocess()
-
-else() # Raw CMake Project
-
-  if (NOT(PYTHON_CALLING_BUILD))
-    bob_get_commit()
-    bob_get_semver()
-  endif()
-
-  ##########
-  #
-  #
-  #  COMPADRE LIBRARIES
-  #
-  #
-  ##########
-
-  if (Compadre_COVERAGE)
-    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-    include(CodeCoverage)
-    append_coverage_compiler_flags()
-    setup_target_for_coverage_lcov(
-      NAME coverage
-      EXECUTABLE ctest
-      EXCLUDE "/Library/*" "${PROJECT_SOURCE_DIR}/kokkos/*" 
-              "${PROJECT_SOURCE_DIR}/kokkos-kernels/*" 
-              "${PROJECT_SOURCE_DIR}/pycompadre/*")
-  endif()
-
-
-  # compadre library
-  add_subdirectory(src)
-
-  if (Compadre_EXAMPLES AND Compadre_TESTS)
-    if (NOT Trilinos_PREFIX)
-      if (NOT TARGET gtest)
-        # gtest from kokkos
-        add_library(gtest
-            kokkos/tpls/gtest/gtest/gtest-all.cc
-        )
-        target_include_directories(gtest PUBLIC kokkos/tpls/gtest)
-      endif()
-    endif()
-  endif()
-
-  if(Compadre_EXAMPLES)
-    add_subdirectory(examples)
-  endif()
-
-  if(Compadre_USE_PYTHON)
-    set(CMAKE_POLICY_DEFAULT_CMP0127 OLD)
-    if (CMAKE_CXX_COMPILER_ID STREQUAL "XL")
-        MESSAGE(FATAL_ERROR "
-        IBM XL compiler not supported for pybind11.
-        Set Compadre_USE_PYTHON:BOOL=OFF or switch compilers.
-        ")
-    endif()
-    add_subdirectory(pycompadre/pybind11)
-    if (${PYTHON_VERSION} VERSION_LESS "3.6")
-        MESSAGE(FATAL_ERROR "
-        Compadre_USE_PYTHON:BOOL=ON but Python version <3.6 is not supported.
-        ")
-    endif()
-    pybind11_add_module(_pycompadre pycompadre/pycompadre.cpp)
-    target_link_libraries(_pycompadre PUBLIC compadre)
-    if (PYTHON_CALLING_BUILD)
-      configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pycompadre/__init__.py.in" "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" COPYONLY)
-    else()
-      set_target_properties(_pycompadre PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/pycompadre")
-      configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pycompadre/__init__.py.in" "${CMAKE_CURRENT_BINARY_DIR}/pycompadre/__init__.py" COPYONLY)
-    endif()
-    set(CMAKE_POLICY_DEFAULT_CMP0127 NEW)
-  endif()
-
-
-  if (Trilinos_PREFIX)
-    bob_end_package_no_recurse("${Trilinos_LIBRARIES}")
-  else()
-    bob_end_package()
-  endif()
-endif()
-
-## print variables beginning with some string
-#function (getListOfVarsStartingWith _prefix _varResult)
-#  get_cmake_property(_vars VARIABLES)
-#  string (REGEX MATCHALL "(^|;)${_prefix}[A-Za-z0-9_]*" _matchedVars "${_vars}")
-#  set (${_varResult} ${_matchedVars} PARENT_SCOPE)
-#endfunction()
-#getListOfVarsStartingWith("SomeString" matchedVars)
-#foreach (_var IN LISTS matchedVars)
-#    message("${_var}=${${_var}}")
-#endforeach()
+CMAKE_MINIMUM_REQUIRED(VERSION 3.16.0 FATAL_ERROR)
+
+# get Compadre_VERSION
+file(STRINGS ${CMAKE_CURRENT_LIST_DIR}/cmake/Compadre_Version.txt Compadre_VERSION)
+
+# Called at the top of every CMakeLists.txt file
+macro(include_tribits_build)
+  if (${PROJECT_NAME}_TRIBITS_DIR)
+    include("${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.tribits.cmake")
+    return()
+  endif()
+endmacro()
+
+# cmake helper functions
+include(${CMAKE_CURRENT_LIST_DIR}/cmake/bob.cmake)
+
+if (${PROJECT_NAME}_TRIBITS_DIR) # TriBITS CMake Project
+
+  #
+  # A) Define the package
+  #
+
+  tribits_package(Compadre)
+
+  #
+  # B) Set up package-specific options
+  #
+  TRIBITS_ADD_OPTION_AND_DEFINE(${PACKAGE_NAME}_ENABLE_DEBUG
+      Compadre_DEBUG
+      "Enable debug code in compadre"
+      ${Trilinos_ENABLE_DEBUG} )
+
+  TRIBITS_ADD_OPTION_AND_DEFINE(${PACKAGE_NAME}_ENABLE_EXTREME_DEBUG
+      Compadre_EXTREME_DEBUG
+      "Enable extreme debug code in compadre"
+      OFF )
+
+  if ("${TPL_ENABLE_CUDA}" STREQUAL "ON")
+      set(Compadre_USE_CUDA   ON  CACHE BOOL "Whether to use CUDA")
+  else ()
+      set(Compadre_USE_CUDA   OFF CACHE BOOL "Whether to use CUDA")
+  endif()
+
+  set(Compadre_USE_MATLAB OFF CACHE BOOL "Don't use Matlab when building in Trilinos")
+  set(Compadre_USE_MPI ${TPL_ENABLE_MPI} CACHE BOOL "Use MPI for parallelism")
+  set(Compadre_USE_PYTHON OFF CACHE BOOL "Don't use Python when building in Trilinos")
+
+  # breakdown Compadre_VERSION from Version.cmake for storage in Compadre_Config.h
+  string(REPLACE "." ";" VLIST ${Compadre_VERSION})
+  list(GET VLIST 0 Compadre_VERSION_MAJOR)
+  list(GET VLIST 1 Compadre_VERSION_MINOR)
+  list(GET VLIST 2 Compadre_VERSION_PATCH)
+
+else() # Raw CMake Project
+
+  ##########
+  #
+  #   Compadre Details
+  #
+  ########## 
+
+  # Disable in-source builds to prevent source tree corruption.
+  if( "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}" )
+    message( FATAL_ERROR "FATAL: In-source builds are not allowed. You should create a separate directory for build files and delete CMakeCache.txt." )
+  endif()
+
+  PROJECT(Compadre VERSION ${Compadre_VERSION} LANGUAGES CXX)
+  if (NOT CMAKE_CXX_STANDARD)
+      set(CMAKE_CXX_STANDARD 17)
+  endif()
+  set(CMAKE_DISABLE_SOURCE_CHANGES ON)
+  set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
+  set(CMAKE_POLICY_DEFAULT_CMP0128 OLD)
+  set(CMAKE_CXX_EXTENSIONS OFF)
+
+  get_directory_property(Compadre_HAS_PARENT PARENT_DIRECTORY)
+
+  if (NOT Compadre_HAS_PARENT)
+    include(GNUInstallDirs)
+  endif()
+
+  bob_begin_package()
+
+  # Set to OFF for significantly faster performance and ON for error tracking
+  bob_option(Compadre_EXTREME_DEBUG "Run Compadre Toolkit in EXTREME DEBUG mode" OFF)
+  bob_option(Compadre_DEBUG "Run Compadre Toolkit in DEBUG mode" ON)
+  if (Compadre_EXTREME_DEBUG)
+    set(Compadre_DEBUG ON)
+    message(STATUS "Compadre_DEBUG: ON (because Compadre_EXTREME_DEBUG is ON)")
+  endif()
+
+  # RPATH related settings
+  # https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/RPATH-handling
+  SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+  SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+  SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+  SET(CMAKE_INSTALL_RPATH "../${CMAKE_INSTALL_LIBDIR}")
+
+  # RPATH should always include the folder it is called from
+  bob_option(PYTHON_CALLING_BUILD "Python setuptools calling build" OFF)
+  bob_option(Compadre_USE_PYTHON "Use PYTHON" OFF)
+  bob_option(Compadre_USE_MATLAB "Use MATLAB interface for PYTHON" OFF)
+  bob_option(Compadre_USE_MPI "Use MPI (not needed for Compadre toolkit)" OFF)
+  set(PYTHON_LIBRARY_PREFIX "..") # relative to examples folder
+  bob_input(PYTHON_EXECUTABLE "" PATH "Python executable location")
+  IF(NOT(PYTHON_EXECUTABLE))
+    MESSAGE(STATUS "Python executable location PYTHON_EXECUTABLE not given. Search made using 'which python'")
+    EXECUTE_PROCESS(
+      COMMAND which "python"
+      OUTPUT_VARIABLE PYTHON_EXECUTABLE
+      OUTPUT_STRIP_TRAILING_WHITESPACE )
+  ENDIF()
+  MESSAGE(STATUS "PYTHON_EXECUTABLE: ${PYTHON_EXECUTABLE}")
+  if (Compadre_USE_PYTHON)
+    # change RPATH for a flat directory structure
+    # when installing pycompadre as Python package
+    if (PYTHON_CALLING_BUILD)
+      if (APPLE)
+        SET(CMAKE_BUILD_RPATH ${CMAKE_BUILD_RPATH} "@loader_path/")
+        SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} "@loader_path/")
+      else()
+        SET(CMAKE_BUILD_RPATH ${CMAKE_BUILD_RPATH} "$ORIGIN/")
+        SET(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_RPATH} "$ORIGIN/")
+        SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,origin")
+      endif()
+    endif()
+  endif()
+
+
+
+  ##########
+  #
+  #
+  #  TPLS
+  #
+  #  Three choices for providing TPLs:
+  #
+  #      a.) None
+  #          - Trilinos_PREFIX, KokkosCore_PREFIX, and KokkosKernels_PREFIX 
+  #            not specified
+  #      b.) Trilinos installation with Kokkos AND KokkosKernels
+  #          - Trilinos_PREFIX specified
+  #      c.) Kokkos AND KokkosKernels standalone installations
+  #          - KokkosCore_PREFIX and KokkosKernels_PREFIX specified
+  #
+  #  For option a, vendored Kokkos and KokkosKernels built for user
+  #
+  ##########
+
+
+
+  #TRILINOS
+  bob_input(Trilinos_PREFIX "" PATH "Path to Trilinos install")
+  if (Trilinos_PREFIX)
+    if(NOT IS_ABSOLUTE ${Trilinos_PREFIX})
+      set(Trilinos_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/${Trilinos_PREFIX}")
+    endif()
+    set(CMAKE_PREFIX_PATH ${Trilinos_PREFIX} ${CMAKE_PREFIX_PATH})
+  endif()
+
+  #KOKKOS
+  bob_input(KokkosCore_PREFIX "" PATH "Path to KokkosCore install")
+  if (KokkosCore_PREFIX)
+    if(NOT IS_ABSOLUTE ${KokkosCore_PREFIX})
+      set(KokkosCore_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/${KokkosCore_PREFIX}")
+    endif()
+    set(CMAKE_PREFIX_PATH ${KokkosCore_PREFIX} ${CMAKE_PREFIX_PATH})
+  endif()
+
+  #KOKKOS-KERNELS
+  bob_input(KokkosKernels_PREFIX "" PATH "Path to KokkosKernels install")
+  if (KokkosKernels_PREFIX)
+    if(NOT IS_ABSOLUTE ${KokkosKernels_PREFIX})
+      set(KokkosKernels_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/${KokkosKernels_PREFIX}")
+    endif()
+    set(CMAKE_PREFIX_PATH ${KokkosKernels_PREFIX} ${CMAKE_PREFIX_PATH})
+  endif()
+  set(KOKKOS_IN_TRILINOS OFF)
+  set(KOKKOS_EXISTING_ELSEWHERE OFF)
+  set(KOKKOS_BUILT_FOR_USER OFF)
+  set(KOKKOSKERNELS_IN_TRILINOS OFF)
+  set(KOKKOSKERNELS_EXISTING_ELSEWHERE OFF)
+  set(KOKKOSKERNELS_BUILT_FOR_USER OFF)
+  set(KOKKOS_MIN "3.3.01")
+
+  if (Trilinos_PREFIX)
+    FIND_PACKAGE(Trilinos COMPONENTS Kokkos KokkosKernels OPTIONAL_COMPONENTS Gtest)
+
+    LIST(REVERSE Trilinos_INCLUDE_DIRS)
+    LIST(REMOVE_DUPLICATES Trilinos_INCLUDE_DIRS)
+    LIST(REVERSE Trilinos_INCLUDE_DIRS)
+
+    LIST(REVERSE Trilinos_LIBRARIES)
+    LIST(REMOVE_DUPLICATES Trilinos_LIBRARIES)
+    LIST(REVERSE Trilinos_LIBRARIES)
+    
+    LIST(REVERSE Trilinos_TPL_LIBRARIES)
+    LIST(REMOVE_DUPLICATES Trilinos_TPL_LIBRARIES)
+    LIST(REVERSE Trilinos_TPL_LIBRARIES)
+    
+    MESSAGE("\nFound Trilinos!  Here are the details: ")
+    MESSAGE("   Trilinos_DIR = ${Trilinos_DIR}")
+    MESSAGE("   Trilinos_VERSION = ${Trilinos_VERSION}")
+    MESSAGE("   Trilinos_PACKAGE_LIST = ${Trilinos_PACKAGE_LIST}")
+    MESSAGE("   Trilinos_LIBRARIES = ${Trilinos_LIBRARIES}")
+    MESSAGE("   Trilinos_BIN_DIRS = ${Trilinos_BIN_DIRS}")
+    MESSAGE("   Trilinos_INCLUDE_DIRS = ${Trilinos_INCLUDE_DIRS}")
+    MESSAGE("   Trilinos_LIBRARY_DIRS = ${Trilinos_LIBRARY_DIRS}")
+    MESSAGE("   Trilinos_TPL_LIST = ${Trilinos_TPL_LIST}")
+    MESSAGE("   Trilinos_TPL_INCLUDE_DIRS = ${Trilinos_TPL_INCLUDE_DIRS}")
+    MESSAGE("   Trilinos_TPL_LIBRARIES = ${Trilinos_TPL_LIBRARIES}")
+    MESSAGE("   Trilinos_TPL_LIBRARY_DIRS = ${Trilinos_TPL_LIBRARY_DIRS}")
+    MESSAGE("   Trilinos_BUILD_SHARED_LIBS = ${Trilinos_BUILD_SHARED_LIBS}")
+    MESSAGE("   Trilinos_CXX_COMPILER_FLAGS = ${Trilinos_CXX_COMPILER_FLAGS}")
+    MESSAGE("End of Trilinos details\n")
+    
+    LIST(REVERSE Trilinos_INCLUDE_DIRS)
+    LIST(REMOVE_DUPLICATES Trilinos_INCLUDE_DIRS)
+    LIST(REVERSE Trilinos_INCLUDE_DIRS)
+    MESSAGE("   Trilinos_INCLUDE_DIRS = ${Trilinos_INCLUDE_DIRS}")
+    MESSAGE("   Trilinos_CXX_FLAGS = ${Trilinos_CXX_COMPILER_FLAGS}")
+
+    IF (Trilinos_VERSION VERSION_GREATER_EQUAL "14.1")
+        set(CompadreKokkosPackageName "Kokkos")
+    ELSE ()
+        set(CompadreKokkosPackageName "KokkosCore")
+    ENDIF()
+    LIST(FIND Trilinos_PACKAGE_LIST ${CompadreKokkosPackageName} ${CompadreKokkosPackageName}ID)
+    IF (${CompadreKokkosPackageName}ID GREATER -1 )
+      MESSAGE(STATUS "Found ${CompadreKokkosPackageName} inside Trilinos!")
+      set(KOKKOS_IN_TRILINOS ON)
+    ELSE()
+      MESSAGE(FATAL_ERROR "Found Trilinos but could not find ${CompadreKokkosPackageName}.")
+    ENDIF()
+
+    LIST(FIND Trilinos_PACKAGE_LIST KokkosKernels KokkosKernelsID)
+    IF (KokkosKernelsID GREATER -1 )
+      MESSAGE(STATUS "Found KokkosKernels inside Trilinos!")
+      set(KOKKOSKERNELS_IN_TRILINOS ON)
+      set(KokkosKernels_FOUND ON)
+    ELSE()
+      MESSAGE(FATAL_ERROR "Found Trilinos but could not find KokkosKernels.")
+    ENDIF()
+
+    LIST(FIND Trilinos_PACKAGE_LIST Gtest GtestID)
+
+    if(KOKKOS_IN_TRILINOS AND NOT(KOKKOSKERNELS_IN_TRILINOS))
+        MESSAGE(FATAL_ERROR "Kokkos found in Trilinos, but not KokkosKernels")
+    endif()
+
+    # Check that CUDA_LAMBDA is enabled if using CUDA in Kokkos
+    list(FIND Kokkos_DEVICES CUDA cuda_index)
+    if (NOT cuda_index EQUAL -1)
+      list(FIND Kokkos_OPTIONS CUDA_LAMBDA cuda_lambda_index)
+      if (cuda_lambda_index EQUAL -1)
+        message(FATAL_ERROR "Please reconfigure Trilinos with -DKokkos_ENABLE_CUDA_LAMBDA:BOOL=ON")
+      endif()
+      set(Compadre_USE_CUDA ON)
+    endif()
+
+    FIND_PACKAGE(Kokkos)
+    message(STATUS "Kokkos Version: ${Kokkos_VERSION}")
+    if (Kokkos_VERSION VERSION_LESS "${KOKKOS_MIN}")
+        message(FATAL_ERROR "${Kokkos_VERSION}: Requires Trilinos with Kokkos version ${KOKKOS_MIN} or greater")
+    endif()
+
+  ENDIF()
+
+  if (NOT KOKKOS_IN_TRILINOS)
+    if (KokkosCore_PREFIX STREQUAL "")
+      SET(KOKKOS_BUILT_FOR_USER ON)
+      if (APPLE)
+        bob_option(Kokkos_ENABLE_CUDA "Whether to use CUDA" OFF)
+        bob_option(Kokkos_ENABLE_OPENMP "Whether to use OPENMP" OFF)
+        bob_option(Kokkos_ENABLE_THREADS "Whether to use THREADS" ON)
+      else()
+        bob_option(Kokkos_ENABLE_CUDA "Whether to use CUDA" OFF)
+        bob_option(Kokkos_ENABLE_OPENMP "Whether to use OPENMP" ON)
+        bob_option(Kokkos_ENABLE_THREADS "Whether to use THREADS" OFF)
+      endif()
+      option(Kokkos_ENABLE_DEBUG "" "${Compadre_DEBUG}")
+      option(Kokkos_ENABLE_CUDA_UVM "" OFF)
+      option(Kokkos_ENABLE_DEBUG_BOUNDS_CHECK "" "${Compadre_EXTREME_DEBUG}")
+      option(Kokkos_ENABLE_CUDA_LAMBDA "" "${Kokkos_ENABLE_CUDA}")
+      option(Kokkos_ENABLE_TESTS "" OFF)
+      option(Kokkos_ENABLE_EXAMPLES "" OFF)
+      if (NOT(KokkosKernels_PREFIX STREQUAL ""))
+          MESSAGE(FATAL_ERROR "KokkosKernels_PREFIX specified but KokkosCore_PREFIX not specified. \
+          Either provide KokkosCore_PREFIX as well, or remove KokkosKernels_PREFIX specification.")
+      endif()
+      # older version of Kokkos shipped with Compadre still uses PTHREAD naming
+      set(Kokkos_ENABLE_PTHREAD ${Kokkos_ENABLE_THREADS}) 
+      # set Compadre_USE_ to use whatever Kokkos_ENABLE_ specified, since user is building Kokkos
+      set(Compadre_USE_CUDA ${Kokkos_ENABLE_CUDA})
+      set(Kokkos_PREFIX ${CMAKE_INSTALL_PREFIX})
+    else()
+      # Existing KokkosCore indicated by user by setting KokkosCore_PREFIX, so we look for it
+      # where specified (only)
+      find_package(Kokkos PATHS "${KokkosCore_PREFIX}" NO_DEFAULT_PATH REQUIRED)
+      message(STATUS "Kokkos Version: ${Kokkos_VERSION}")
+      if (Kokkos_VERSION VERSION_LESS "${KOKKOS_MIN}")
+          message(FATAL_ERROR "${Kokkos_VERSION}: Requires Kokkos version ${KOKKOS_MIN} or greater")
+      endif()
+      set(KOKKOS_EXISTING_ELSEWHERE ON)
+      # set Compadre_USE_ to whatever is enabled in Kokkos build
+      if (TARGET Kokkos::CUDA)
+        set(Compadre_USE_CUDA ON)
+      endif()
+      set(Kokkos_PREFIX "${KokkosCore_PREFIX}")
+    endif()
+  endif()
+  message(STATUS "Compadre_USE_CUDA: ${Compadre_USE_CUDA}")
+
+  option(Kokkos_CXX_STANDARD "" "${CMAKE_CXX_STANDARD}")
+
+  if (NOT(KOKKOS_IN_TRILINOS) AND (KokkosCore_PREFIX STREQUAL ""))
+      add_subdirectory(kokkos)
+      get_directory_property(Kokkos_VERSION DIRECTORY kokkos DEFINITION Kokkos_VERSION)
+      message(STATUS "Kokkos Version: ${Kokkos_VERSION}")
+  endif()
+  if(Kokkos_VERSION VERSION_LESS "3.7")
+    set(KOKKOS_THREADS_ARG "--kokkos-threads")
+  else()
+    set(KOKKOS_THREADS_ARG "--kokkos-num-threads")
+  endif()
+
+  if (KOKKOSKERNELS_IN_TRILINOS)
+    if (Compadre_USE_CUDA)
+      list(FIND Trilinos_TPL_LIST "CUDA" CUDAID)
+      if (NOT(CUDAID GREATER -1))
+          MESSAGE(FATAL_ERROR "Compadre_USE_CUDA set to ON, but CUDA not defined in Trilinos")
+      endif()
+    endif()
+    # register Trilinos so that it shows up in CompadreConfig.cmake
+    set(Compadre_EXT_DEPS Trilinos)
+  else()
+    if (KokkosKernels_PREFIX STREQUAL "")
+      SET(KOKKOSKERNELS_BUILT_FOR_USER ON)
+      # both are required to be sure it finds it
+      SET(KokkosKernels_ENABLE_EXAMPLES OFF)
+      SET(KokkosKernels_ENABLE_TESTS OFF)
+      OPTION(KokkosKernels_ETI_ONLY "" OFF)
+      SET(KokkosKernels_ETI_ONLY OFF)
+      OPTION(KokkosKernels_INST_OFFSET_SIZE_T "" OFF)
+      SET(KokkosKernels_INST_OFFSET_SIZE_T OFF)
+      OPTION(KokkosKernels_INST_OFFSET_INT "" OFF)
+      SET(KokkosKernels_INST_OFFSET_INT OFF)
+      OPTION(KokkosKernels_INST_LAYOUTLEFT "" OFF)
+      SET(KokkosKernels_INST_LAYOUTLEFT OFF)
+      OPTION(KokkosKernels_INST_LAYOUTRIGHT "" OFF)
+      SET(KokkosKernels_INST_LAYOUTRIGHT OFF)
+      OPTION(KokkosKernels_INST_DOUBLE "" OFF)
+      SET(KokkosKernels_INST_DOUBLE OFF)
+      OPTION(KokkosKernels_INST_ORDINAL_INT "" OFF)
+      SET(KokkosKernels_INST_ORDINAL_INT OFF)
+      OPTION(KokkosKernels_ENABLE_TPL_CUBLAS "" OFF)
+      SET(KokkosKernels_ENABLE_TPL_CUBLAS OFF)
+      OPTION(KokkosKernels_ENABLE_TPL_CUSPARSE "" OFF)
+      SET(KokkosKernels_ENABLE_TPL_CUSPARSE OFF)
+      OPTION(KokkosKernels_INST_MEMSPACE_CUDAUVMSPACE "" OFF)
+      SET(KokkosKernels_INST_MEMSPACE_CUDAUVMSPACE OFF)
+      OPTION(KokkosKernels_INST_EXECSPACE_THREADS "" ${Kokkos_ENABLE_THREADS})
+      SET(KokkosKernels_INST_EXECSPACE_THREADS ${Kokkos_ENABLE_THREADS})
+      OPTION(KokkosKernels_INST_EXECSPACE_OPENMP "" ${Kokkos_ENABLE_OPENMP})
+      SET(KokkosKernels_INST_EXECSPACE_OPENMP ${Kokkos_ENABLE_OPENMP})
+      add_subdirectory(kokkos-kernels)
+      if (NOT(KokkosCore_PREFIX STREQUAL ""))
+          MESSAGE(FATAL_ERROR "KokkosCore_PREFIX specified but KokkosKernels_PREFIX not specified. \
+          Either provide KokkosKernels_PREFIX as well, or remove KokkosCore_PREFIX specification.")
+      endif()
+      set(KokkosKernels_PREFIX ${CMAKE_INSTALL_PREFIX})
+    else()
+      # Existing KokkosCore indicated by user by setting KokkosCore_PREFIX, so we look for it
+      # where specified (only)
+      find_package(KokkosKernels PATHS "${KokkosKernels_PREFIX}" NO_DEFAULT_PATH REQUIRED)
+      if(Compadre_USE_CUDA AND NOT(TARGET Kokkos::CUDA))
+        MESSAGE(FATAL_ERROR "Compadre_USE_CUDA set to ON, but Kokkos::CUDA not defined")
+      endif()
+      set(KOKKOSKERNELS_EXISTING_ELSEWHERE ON)
+    endif()
+    # register Kokkos and KokkosKernels so that they show up in CompadreConfig.cmake
+    set(Compadre_EXT_DEPS Kokkos KokkosKernels)
+  endif()
+
+
+
+  #MPI (Not really needed, only used so that if a kokkos-tool was built with MPI, it won't segfault)
+  if (Compadre_USE_MPI)
+    FIND_PACKAGE(MPI QUIET)
+    bob_option(Compadre_USE_MPI "Use MPI for parallelism" ${MPI_CXX_FOUND})
+    message(STATUS "MPI Enabled: ${MPI_CXX_FOUND}")
+    if (MPI_CXX_FOUND)
+        MESSAGE(STATUS "MPI_CXX_INCLUDE_PATH: ${MPI_CXX_INCLUDE_PATH}")
+        MESSAGE(STATUS "MPI_CXX_LIBRARIES: ${MPI_CXX_LIBRARIES}")
+    endif()
+  endif (Compadre_USE_MPI)
+
+
+
+  ##########
+  #
+  #
+  #  OPTIONS
+  #
+  #
+  ##########
+
+
+
+  bob_option(Compadre_TESTS "Compile Compadre tests" ON)
+  bob_option(Compadre_EXAMPLES "Compile Compadre examples" "${Compadre_TESTS}")
+  bob_option(Compadre_COVERAGE "Use code coverage" OFF)
+
+
+endif() 
+
+##########
+#
+#
+#  PREPROCESSOR DEFINES FOR USE WHEN BUILDING CODE
+#
+#
+##########
+
+
+set(Compadre_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+set(Compadre_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
+
+set(Compadre_KEY_BOOLS
+    Compadre_DEBUG
+    Compadre_EXTREME_DEBUG
+    Compadre_USE_CUDA
+    Compadre_USE_MPI
+    Compadre_USE_PYTHON
+    PYTHON_CALLING_BUILD
+   )
+
+set(Compadre_KEY_INTS
+    Compadre_VERSION_MAJOR
+    Compadre_VERSION_MINOR
+    Compadre_VERSION_PATCH
+   )
+
+set(Compadre_KEY_STRINGS
+    Compadre_SEMVER
+    Compadre_COMMIT
+    Compadre_CXX_FLAGS
+    Compadre_CMAKE_ARGS
+    Compadre_INSTALL_PREFIX
+)
+
+if (${PROJECT_NAME}_TRIBITS_DIR) # TriBITS CMake Project
+
+  #
+  # C) Add the libraries, tests, and examples
+  #
+
+  add_subdirectory(src)
+  tribits_add_test_directories(examples)
+
+  #
+  # D) Do standard postprocessing
+  #
+
+  tribits_package_postprocess()
+
+else() # Raw CMake Project
+
+  if (NOT(PYTHON_CALLING_BUILD))
+    bob_get_commit()
+    bob_get_semver()
+  endif()
+
+  ##########
+  #
+  #
+  #  COMPADRE LIBRARIES
+  #
+  #
+  ##########
+
+  if (Compadre_COVERAGE)
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+    include(CodeCoverage)
+    append_coverage_compiler_flags()
+    setup_target_for_coverage_lcov(
+      NAME coverage
+      EXECUTABLE ctest
+      EXCLUDE "/Library/*" "${PROJECT_SOURCE_DIR}/kokkos/*" 
+              "${PROJECT_SOURCE_DIR}/kokkos-kernels/*" 
+              "${PROJECT_SOURCE_DIR}/pycompadre/*")
+  endif()
+
+
+  # compadre library
+  add_subdirectory(src)
+
+  if (Compadre_EXAMPLES AND Compadre_TESTS)
+    if (NOT Trilinos_PREFIX)
+      if (NOT TARGET gtest)
+        # gtest from kokkos
+        add_library(gtest
+            kokkos/tpls/gtest/gtest/gtest-all.cc
+        )
+        target_include_directories(gtest PUBLIC kokkos/tpls/gtest)
+      endif()
+    endif()
+  endif()
+
+  if(Compadre_EXAMPLES)
+    add_subdirectory(examples)
+  endif()
+
+  if(Compadre_USE_PYTHON)
+    set(CMAKE_POLICY_DEFAULT_CMP0127 OLD)
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "XL")
+        MESSAGE(FATAL_ERROR "
+        IBM XL compiler not supported for pybind11.
+        Set Compadre_USE_PYTHON:BOOL=OFF or switch compilers.
+        ")
+    endif()
+    add_subdirectory(pycompadre/pybind11)
+    if (${PYTHON_VERSION} VERSION_LESS "3.6")
+        MESSAGE(FATAL_ERROR "
+        Compadre_USE_PYTHON:BOOL=ON but Python version <3.6 is not supported.
+        ")
+    endif()
+    pybind11_add_module(_pycompadre pycompadre/pycompadre.cpp)
+    target_link_libraries(_pycompadre PUBLIC compadre)
+    if (PYTHON_CALLING_BUILD)
+      configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pycompadre/__init__.py.in" "${CMAKE_CURRENT_BINARY_DIR}/__init__.py" COPYONLY)
+    else()
+      set_target_properties(_pycompadre PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/pycompadre")
+      configure_file("${CMAKE_CURRENT_SOURCE_DIR}/pycompadre/__init__.py.in" "${CMAKE_CURRENT_BINARY_DIR}/pycompadre/__init__.py" COPYONLY)
+    endif()
+    set(CMAKE_POLICY_DEFAULT_CMP0127 NEW)
+  endif()
+
+
+  if (Trilinos_PREFIX)
+    bob_end_package_no_recurse("${Trilinos_LIBRARIES}")
+  else()
+    bob_end_package()
+  endif()
+endif()
+
+## print variables beginning with some string
+#function (getListOfVarsStartingWith _prefix _varResult)
+#  get_cmake_property(_vars VARIABLES)
+#  string (REGEX MATCHALL "(^|;)${_prefix}[A-Za-z0-9_]*" _matchedVars "${_vars}")
+#  set (${_varResult} ${_matchedVars} PARENT_SCOPE)
+#endfunction()
+#getListOfVarsStartingWith("SomeString" matchedVars)
+#foreach (_var IN LISTS matchedVars)
+#    message("${_var}=${${_var}}")
+#endforeach()
diff --git a/packages/compadre/examples/CMakeLists.txt b/packages/compadre/examples/CMakeLists.txt
index f2f080d5d31d..a7d73faca892 100644
--- a/packages/compadre/examples/CMakeLists.txt
+++ b/packages/compadre/examples/CMakeLists.txt
@@ -125,10 +125,10 @@ if (Compadre_EXAMPLES)
       # Multisite manifold test for GMLS
       #ADD_TEST(NAME GMLS_Manifold_MultiSite COMMAND ${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold_MultiSite_Test "3" "4" "${KOKKOS_THREADS_ARG}=2")
       #SET_TESTS_PROPERTIES(GMLS_Manifold_MultiSite PROPERTIES LABELS "IntegrationTest;integration;kokkos;multi;manifold" TIMEOUT 10)
-      if (Python3_EXECUTABLE)
+      if (PYTHON_EXECUTABLE)
         # Python driven test of a C++ executable (Python changes command line arguments given to executable)
         CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/GMLS_Manifold_Multiple_Evaluation_Sites.py.in" "${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold_Multiple_Evaluation_Sites.py" @ONLY)
-        ADD_TEST(NAME GMLS_Manifold_MultiSite_Refinement_Study COMMAND ${Python3_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold_Multiple_Evaluation_Sites.py" "--porder=3" "--grids=3")
+        ADD_TEST(NAME GMLS_Manifold_MultiSite_Refinement_Study COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold_Multiple_Evaluation_Sites.py" "--porder=3" "--grids=3")
         SET_TESTS_PROPERTIES(GMLS_Manifold_MultiSite_Refinement_Study
           PROPERTIES
             LABELS "ConvergenceTest;convergence;manifold" 
@@ -136,7 +136,7 @@ if (Compadre_EXAMPLES)
             REQUIRED_FILES
               $<TARGET_FILE:GMLS_Manifold_MultiSite_Test>
         )
-      endif() # Python3_EXECUTABLE
+      endif() # PYTHON_EXECUTABLE
 
       # Divergence-free basis test for GMLS on non-manifold
       ADD_TEST(NAME GMLS_DivergenceFree_Dim3_P3_QR COMMAND ${CMAKE_CURRENT_BINARY_DIR}/GMLS_Divergence_Test "--p" "3" "--nt" "200" "--d" "3" "${KOKKOS_THREADS_ARG}=2")
@@ -154,10 +154,10 @@ if (Compadre_EXAMPLES)
     #    ADD_TEST(NAME GMLS_Manifold_Dim3 COMMAND ${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold_Test "4" "200" "3" "1" "0" "0" "${KOKKOS_THREADS_ARG}=2")
     #    SET_TESTS_PROPERTIES(GMLS_Manifold_Dim3 PROPERTIES LABELS "IntegrationTest;integration;kokkos" TIMEOUT 10)
 
-    if (Python3_EXECUTABLE)
+    if (PYTHON_EXECUTABLE)
       # Python driven test of a C++ executable (Python changes command line arguments given to executable) - calling QR solver
       CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/GMLS_Manifold.py.in" "${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold.py" @ONLY)
-      ADD_TEST(NAME GMLS_Manifold_Refinement_Study_QR COMMAND ${Python3_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold.py" "--porder=3" "--grids=4" "--solver-type=QR")
+      ADD_TEST(NAME GMLS_Manifold_Refinement_Study_QR COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold.py" "--porder=3" "--grids=4" "--solver-type=QR")
       SET_TESTS_PROPERTIES(GMLS_Manifold_Refinement_Study_QR
           PROPERTIES
             LABELS "ConvergenceTest;convergence;manifold" 
@@ -167,7 +167,7 @@ if (Compadre_EXAMPLES)
       )
 
       # Python driven test of a C++ executable (Python changes command line arguments given to executable) - calling LU solver
-      ADD_TEST(NAME GMLS_Manifold_Refinement_Study_LU COMMAND ${Python3_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold.py" "--porder=3" "--grids=4" "--solver-type=LU")
+      ADD_TEST(NAME GMLS_Manifold_Refinement_Study_LU COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/GMLS_Manifold.py" "--porder=3" "--grids=4" "--solver-type=LU")
       SET_TESTS_PROPERTIES(GMLS_Manifold_Refinement_Study_LU
           PROPERTIES
             LABELS "ConvergenceTest;convergence;manifold" 
@@ -178,7 +178,7 @@ if (Compadre_EXAMPLES)
 
       # Python driven test of a C++ executable (Python changes command line arguments given to executable)
       CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/GMLS_Staggered_Manifold.py.in" "${CMAKE_CURRENT_BINARY_DIR}/GMLS_Staggered_Manifold.py" @ONLY)
-      ADD_TEST(NAME GMLS_Staggered_Manifold_Refinement_Study COMMAND ${Python3_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/GMLS_Staggered_Manifold.py" "--porder=3" "--grids=4")
+      ADD_TEST(NAME GMLS_Staggered_Manifold_Refinement_Study COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_BINARY_DIR}/GMLS_Staggered_Manifold.py" "--porder=3" "--grids=4")
       SET_TESTS_PROPERTIES(GMLS_Staggered_Manifold_Refinement_Study
         PROPERTIES
           LABELS "ConvergenceTest;convergence;manifold;staggered" 
@@ -186,7 +186,7 @@ if (Compadre_EXAMPLES)
           REQUIRED_FILES
             $<TARGET_FILE:GMLS_Staggered_Manifold_Test>
       )
-    endif() # Python3_EXECUTABLE
+    endif() # PYTHON_EXECUTABLE
 
     # Utility test - Filter By ID
     ADD_TEST(NAME Test_Utilities COMMAND ${CMAKE_CURRENT_BINARY_DIR}/TestUtility "200" "${KOKKOS_THREADS_ARG}=2")
@@ -225,13 +225,13 @@ if (Compadre_EXAMPLES)
     #SET_TESTS_PROPERTIES(NeighborKNNSearch3DTest_3 PROPERTIES LABELS "kdtree;nanoflann;" TIMEOUT 5)
 
     # WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH} )
-    if (Compadre_USE_PYTHON AND Python3_EXECUTABLE)
+    if (Compadre_USE_PYTHON AND PYTHON_EXECUTABLE)
       FILE(COPY "${CMAKE_CURRENT_SOURCE_DIR}/../pycompadre/examples/test_pycompadre.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../pycompadre/examples")
       FILE(COPY "${CMAKE_CURRENT_SOURCE_DIR}/../pycompadre/examples/test_pycompadre_manifold.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../pycompadre/examples")
       FILE(COPY "${CMAKE_CURRENT_SOURCE_DIR}/../pycompadre/examples/test_tangent_planes_manifold.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../pycompadre/examples")
       FILE(COPY "${CMAKE_CURRENT_SOURCE_DIR}/../pycompadre/examples/kokkos_test_case.py" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/../pycompadre/examples")
       CONFIGURE_FILE("${CMAKE_CURRENT_SOURCE_DIR}/Python_3D_Convergence.py.in" "${CMAKE_CURRENT_BINARY_DIR}/Python_3D_Convergence.py" @ONLY)
-      ADD_TEST(NAME GMLS_Python_Convergence_Test_3d_Point_Reconstruction COMMAND "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/Python_3D_Convergence.py" "${KOKKOS_THREADS_ARG}=4")
+      ADD_TEST(NAME GMLS_Python_Convergence_Test_3d_Point_Reconstruction COMMAND "${PYTHON_EXECUTABLE}" "${CMAKE_CURRENT_BINARY_DIR}/Python_3D_Convergence.py" "${KOKKOS_THREADS_ARG}=4")
       SET_TESTS_PROPERTIES(GMLS_Python_Convergence_Test_3d_Point_Reconstruction PROPERTIES LABELS "IntegrationTest;integration;python;kokkos" TIMEOUT 10)
 
       if (Compadre_USE_MATLAB)
@@ -239,7 +239,7 @@ if (Compadre_EXAMPLES)
         SET_TESTS_PROPERTIES(GMLS_Matlab_Python_Interface_1d_Point_Reconstruction PROPERTIES LABELS "IntegrationTest;integration;python;kokkos;matlab" TIMEOUT 10)
       endif()
 
-      ADD_TEST(NAME PyCOMPADRE_Tests COMMAND "${Python3_EXECUTABLE}" "-m" "unittest" "discover" "-s" "${PYTHON_LIBRARY_PREFIX}/pycompadre/examples")
+      ADD_TEST(NAME PyCOMPADRE_Tests COMMAND "${PYTHON_EXECUTABLE}" "-m" "unittest" "discover" "-s" "${PYTHON_LIBRARY_PREFIX}/pycompadre/examples")
       SET_TESTS_PROPERTIES(PyCOMPADRE_Tests PROPERTIES ENVIRONMENT PYTHONPATH=${PYTHON_LIBRARY_PREFIX})
       SET_TESTS_PROPERTIES(PyCOMPADRE_Tests PROPERTIES LABELS "pycompadre" TIMEOUT 30)