Tpetra: Remove duplication from removal of Kokkos subpackages (trilin…

…os#11545, trilinos#11808)

This duplication resulted from running a simple automated script that created
a commit in PR trilinos#11808.

packages/tpetra/core/CMakeLists.txt

@@ -33,8 +33,6 @@ SET(Tpetra_MACHINE_XML_FILE_DIR
 GLOBAL_SET(HAVE_TPETRACORE_TEUCHOSKOKKOSCOMPAT ON)
 GLOBAL_SET(HAVE_TPETRACORE_TEUCHOSKOKKOSCOMM ON)
 GLOBAL_SET(HAVE_TPETRACORE_KOKKOS ON)
-GLOBAL_SET(HAVE_TPETRACORE_KOKKOS ON)
-GLOBAL_SET(HAVE_TPETRACORE_KOKKOS ON)
 
 TRIBITS_ADD_OPTION_AND_DEFINE(
   ${PACKAGE_NAME}_ENABLE_SS_TESTING

packages/tpetra/core/cmake/TpetraCore_config.h.in

@@ -79,7 +79,7 @@
 #cmakedefine HAVE_TPETRA_MMM_TIMINGS
 #cmakedefine HAVE_TPETRA_DISTRIBUTOR_TIMINGS
 
-/* Define when enabling KokkosCore in Tpetra */
+/* Define when enabling Kokkos in Tpetra */
 #cmakedefine HAVE_TPETRACORE_KOKKOS
 #ifdef HAVE_TPETRACORE_KOKKOS
 // For backwards compatibility
@@ -95,13 +95,6 @@
 #  define HAVE_TPETRA_KOKKOSCOMPAT
 #endif // HAVE_TPETRACORE_TEUCHOSKOKKOSCOMPAT
 
-/* Define when enabling KokkosContainers in TpetraCore */
-#cmakedefine HAVE_TPETRACORE_KOKKOS
-#ifdef HAVE_TPETRACORE_KOKKOS
-// For backwards compatibility
-#  define HAVE_TPETRA_KOKKOS
-#endif // HAVE_TPETRACORE_KOKKOS
-
 /* Define when enabling KokkosComm in TpetraCore */
 #cmakedefine HAVE_TPETRACORE_TEUCHOSKOKKOSCOMM
 #ifdef HAVE_TPETRACORE_TEUCHOSKOKKOSCOMM