applies downstream patch for ParMetis link and Zoltan macro

nasa · Jul 22, 2021 · ca8d963 · ca8d963
1 parent 12e289f
commit ca8d963
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/cmake/FindParMETIS.cmake b/cmake/FindParMETIS.cmake
@@ -28,7 +28,12 @@ if(METIS_FOUND)
         add_library(ParMETIS::ParMETIS UNKNOWN IMPORTED)
         set_target_properties(ParMETIS::ParMETIS PROPERTIES
                 IMPORTED_LOCATION ${PARMETIS_LIBRARY}
-                INTERFACE_INCLUDE_DIRECTORIES ${PARMETIS_INCLUDE_DIR}
+                )
+        set_property(TARGET ParMETIS::ParMETIS PROPERTY
+                INTERFACE_LINK_LIBRARIES ${METIS_LIBRARIES}
+                )
+        set_property(TARGET ParMETIS::ParMETIS PROPERTY
+                INTERFACE_INCLUDE_DIRECTORIES ${PARMETIS_INCLUDE_DIRS}
                 )
     endif()
 else()

diff --git a/cmake/FindZoltan.cmake b/cmake/FindZoltan.cmake
@@ -3,7 +3,7 @@ find_library(ZOLTAN_LIBRARY zoltan)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
-        ZOLTAN
+        Zoltan
         DEFAULT_MSG
         ZOLTAN_LIBRARY ZOLTAN_INCLUDE_DIR
 )

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -170,7 +170,8 @@ if (MPI_FOUND)
     create_library(refine_with_mpi STATIC ${REF_MPI_SRC})
     target_include_directories(refine_with_mpi PRIVATE ${MPI_INCLUDE_PATH})
     target_link_libraries(refine_with_mpi PRIVATE ${MPI_C_LIBRARIES})
-    target_compile_definitions(refine_with_mpi PRIVATE HAVE_MPI)
+    target_link_libraries(refine_with_mpi PRIVATE ${THIRD_PARTY_LIBRARIES})
+    target_compile_definitions(refine_with_mpi PRIVATE HAVE_MPI ${EXTRA_DEFINITIONS})
 endif ()
 
 create_library(refine_core STATIC ${REF_CORE_SRC} ${REF_TWO_HEADERS})