From e7ce3e00974b5072da52e1f37c5d1e36e435a6e4 Mon Sep 17 00:00:00 2001
From: Tim Fuller <tjfulle@sandia.gov>
Date: Tue, 20 Aug 2019 13:36:16 -0600
Subject: [PATCH] Zoltan2: use ZOLTAN2_HAVE_EPETRA. (#5752)

* Zoltan2: use ZOLTAN2_HAVE_EPETRA.

Closes: #5751
Part of: #5602

* only disable epetra in zoltan2 if user explicitly requested

* some versions of cmake did not like the last conditional
---
 packages/zoltan2/CMakeLists.txt           | 7 +++++--
 packages/zoltan2/test/temp/CMakeLists.txt | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/zoltan2/CMakeLists.txt b/packages/zoltan2/CMakeLists.txt
index abb017d92c56..dc71c7645072 100644
--- a/packages/zoltan2/CMakeLists.txt
+++ b/packages/zoltan2/CMakeLists.txt
@@ -48,9 +48,12 @@ ENDFOREACH()
 #
 # B) Set up package-specific options
 #
-
 IF (${PROJECT_NAME}_ENABLE_Epetra)
- GLOBAL_SET(HAVE_${PACKAGE_NAME_UC}_EPETRA ON)
+  IF(DEFINED ${PACKAGE_NAME}_ENABLE_Epetra)
+    GLOBAL_SET(HAVE_${PACKAGE_NAME_UC}_EPETRA ${${PACKAGE_NAME}_ENABLE_Epetra})
+  ELSE()
+   GLOBAL_SET(HAVE_${PACKAGE_NAME_UC}_EPETRA ON)
+  ENDIF ()
 ENDIF ()
 
 IF (${PROJECT_NAME}_ENABLE_Galeri)
diff --git a/packages/zoltan2/test/temp/CMakeLists.txt b/packages/zoltan2/test/temp/CMakeLists.txt
index 6db177d47ce5..4fea0259a3a1 100644
--- a/packages/zoltan2/test/temp/CMakeLists.txt
+++ b/packages/zoltan2/test/temp/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 # This test compares Zoltan with Tpetra and Epetra.  Thus, it should run
 # only Tpetra and Zoltan with LO=GO=int, as Epetra does.
-IF (${PROJECT_NAME}_ENABLE_Epetra)
+IF (${PACKAGE_NAME_UC}_HAVE_EPETRA)
   IF (Tpetra_INST_INT_INT AND Tpetra_INST_DOUBLE)
     IF (NOT Zoltan_ENABLE_ULONG_IDS AND NOT Zoltan_ENABLE_ULLONG_IDS)
       TRIBITS_ADD_EXECUTABLE_AND_TEST(
@@ -49,7 +49,7 @@ TRIBITS_ADD_TEST(
   COMM mpi serial
 )
 
-#IF (${PROJECT_NAME}_ENABLE_Epetra)
+#IF (${PACKAGE_NAME_UC}_HAVE_EPETRA)
 #  TRIBITS_ADD_EXECUTABLE_AND_TEST(
 #    XpetraEpetraMap
 #    SOURCES XpetraEpetraMap.cpp