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
trilinos · Aug 20, 2019 · e7ce3e0 · e7ce3e0
1 parent d515b11
commit e7ce3e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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