detect required Zoltan dependency

- cmake/FindZoltan.cmake: fix find_path/find_library when ZOLTAN_PREFIX
  not specified. since it is always defined, check instead for
  truthiness.
- add FATAL_ERROR if Zoltan is not found.
- add debug message with found Zoltan location.
- find Zoltan_config.h and search for #define HAVE_PARMETIS and #define
  HAVE_SCOTCH. use the results to determine which libraries are
  required.
- set the PUMI_HAS_PARMETIS and PUMI_HAS_PTSCOTCH from this file.
- zoltan/CMakeLists.txt: remove ENABLE_PARMETIS and ENABLE_PTSCOTCH
  cache options.
- replace ENABLE_PTSCOTCH/ENABLE_PARMETIS with
  PUMI_HAS_PARMETIS/PUMI_HAS_PTSCOTCH which are detected in
  FindZoltan.cmake.

Signed-off-by: Aiden Woodruff <[email protected]>

Author: bobpaw

Diff for: cmake/FindZoltan.cmake

@@ -10,7 +10,7 @@ if(ZOLTAN_PREFIX)
   message(STATUS "ZOLTAN_PREFIX ${ZOLTAN_PREFIX}")
 endif()
 
-if(DEFINED ZOLTAN_PREFIX)
+if(ZOLTAN_PREFIX)
   find_path(ZOLTAN_INCLUDE_DIR zoltan.h
     PATHS "${ZOLTAN_PREFIX}/include"
     NO_DEFAULT_PATH
@@ -23,14 +23,37 @@ else()
   find_path(ZOLTAN_INCLUDE_DIR zoltan.h)
   find_library(ZOLTAN_LIBRARY zoltan)
 endif()
+if (ZOLTAN_INCLUDE_DIR)
+  message(DEBUG "ZOLTAN_INCLUDE_DIR ${ZOLTAN_INCLUDE_DIR}")
+else()
+  message(FATAL_ERROR "Zoltan not found.")
+endif()
 
 set(ZOLTAN_LIBRARIES ${ZOLTAN_LIBRARY} )
 set(ZOLTAN_INCLUDE_DIRS ${ZOLTAN_INCLUDE_DIR} )
 
-if(ENABLE_PTSCOTCH)
-  find_package(SCOTCH CONFIG REQUIRED)
-elseif(ENABLE_PARMETIS)
+find_file(ZOLTAN_CONFIG_FILE Zoltan_config.h
+  "${ZOLTAN_INCLUDE_DIRS}"
+  NO_DEFAULT_PATH
+)
+message(DEBUG "ZOLTAN_CONFIG_FILE ${ZOLTAN_CONFIG_FILE}")
+file(READ "${ZOLTAN_CONFIG_FILE}" ZOLTAN_CONFIG_TEXT)
+string(FIND
+  "${ZOLTAN_CONFIG_TEXT}" "#define HAVE_PARMETIS"
+  ZOLTAN_FIND_PARMETIS
+)
+string(FIND
+  "${ZOLTAN_CONFIG_TEXT}" "#define HAVE_SCOTCH"
+  ZOLTAN_FIND_PTSCOTCH
+)
+
+if(NOT ZOLTAN_FIND_PARMETIS EQUAL -1)
   find_package(Parmetis MODULE REQUIRED)
+  set(PUMI_HAS_PARMETIS TRUE)
+endif()
+if(NOT ZOLTAN_FIND_PTSCOTCH EQUAL -1)
+  find_package(SCOTCH CONFIG REQUIRED)
+  set(PUMI_HAS_PTSCOTCH TRUE)
 endif()
 
 include(FindPackageHandleStandardArgs)
@@ -42,4 +65,4 @@ find_package_handle_standard_args(
     ZOLTAN_LIBRARY ZOLTAN_INCLUDE_DIR
 )
 
-mark_as_advanced(ZOLTAN_INCLUDE_DIR ZOLTAN_LIBRARY )
+mark_as_advanced(ZOLTAN_INCLUDE_DIR ZOLTAN_LIBRARY ZOLTAN_CONFIG_FILE)

Diff for: zoltan/CMakeLists.txt

@@ -5,14 +5,8 @@ endif()
 
 # Package options
 option(ENABLE_ZOLTAN "Enable Zoltan interface [ON|OFF]" OFF)
-option(ENABLE_PARMETIS "Enable ParMETIS for Zoltan [ON|OFF]" OFF)
-option(ENABLE_PTSCOTCH "Enable PT-Scotch for Zoltan [ON|OFF]" OFF)
 xsdk_add_tpl(ZOLTAN)
-xsdk_add_tpl(PARMETIS)
-xsdk_add_tpl(PTSCOTCH)
 message(STATUS "ENABLE_ZOLTAN: " ${ENABLE_ZOLTAN})
-message(STATUS "ENABLE_PARMETIS: " ${ENABLE_PARMETIS})
-message(STATUS "ENABLE_PTSCOTCH: " ${ENABLE_PTSCOTCH})
 
 if(SCOREC_NO_MPI AND ENABLE_ZOLTAN)
   message(FATAL_ERROR "SCOREC_NO_MPI is incompatible with Zoltan.")
@@ -66,12 +60,13 @@ if(ENABLE_ZOLTAN)
   target_include_directories(apf_zoltan PRIVATE ${ZOLTAN_INCLUDE_DIRS})
   target_link_libraries(apf_zoltan PUBLIC ${ZOLTAN_LIBRARIES})
   target_compile_definitions(apf_zoltan PUBLIC PUMI_HAS_ZOLTAN)
-  if(ENABLE_PTSCOTCH)
+  if(PUMI_HAS_PTSCOTCH)
     target_link_libraries(apf_zoltan PUBLIC
       SCOTCH::ptscotch SCOTCH::ptscotcherr
     )
     target_compile_definitions(apf_zoltan PUBLIC PUMI_HAS_PTSCOTCH)
-  elseif(ENABLE_PARMETIS)
+  endif()
+  if(PUMI_HAS_PARMETIS)
     target_include_directories(apf_zoltan PRIVATE ${PARMETIS_INCLUDE_DIRS})
     target_link_libraries(apf_zoltan PUBLIC ${PARMETIS_LIBRARIES})
     target_compile_definitions(apf_zoltan PUBLIC PUMI_HAS_PARMETIS)