Moved axl_mpi to AXL and made new AXL_MPI lib

LLNL · Apr 4, 2022 · d3fb8cf · d3fb8cf
1 parent 23a3bb8
commit d3fb8cf
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,9 +14,9 @@ INCLUDE(CheckIncludeFile)
 FIND_PACKAGE(AXL REQUIRED)
 IF(AXL_FOUND)
 	INCLUDE_DIRECTORIES(${AXL_INCLUDE_DIRS})
-	LIST(APPEND SCR_EXTERNAL_LIBS ${AXL_LIBRARIES})
+    LIST(APPEND SCR_EXTERNAL_LIBS ${AXL_MPI_LIBRARIES})
 	LIST(APPEND SCR_EXTERNAL_SERIAL_LIBS ${AXL_LIBRARIES})
-	LIST(APPEND SCR_LINK_LINE "-laxl")
+	LIST(APPEND SCR_LINK_LINE "-laxl_mpi")
 ENDIF(AXL_FOUND)
 
 ## ER

diff --git a/cmake/FindAXL.cmake b/cmake/FindAXL.cmake
@@ -13,6 +13,11 @@ FIND_LIBRARY(AXL_LIBRARIES
     HINTS ${WITH_AXL_PREFIX}/lib
 )
 
+FIND_LIBRARY(AXL_MPI_LIBRARIES
+    NAMES axl_mpi
+    HINTS ${WITH_AXL_PREFIX}/lib
+)
+
 FIND_PATH(AXL_INCLUDE_DIRS
     NAMES axl.h
     HINTS ${WITH_AXL_PREFIX}/include
@@ -21,6 +26,7 @@ FIND_PATH(AXL_INCLUDE_DIRS
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(AXL DEFAULT_MSG
     AXL_LIBRARIES
+    AXL_MPI_LIBRARIES
     AXL_INCLUDE_DIRS
 )
 

diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt
@@ -180,7 +180,6 @@ LIST(APPEND libscr_srcs
     scr/src/scr_summary.c
     scr/src/scr_util.c
     scr/src/scr_util_mpi.c
-    scr/src/axl_mpi.c
     scr/src/scr_flush_nompi.c
 )
 
@@ -199,20 +198,20 @@ ADD_LIBRARY(scr_o OBJECT
 )
 
 LIST(APPEND scr_tpl_objects
-  $<TARGET_OBJECTS:axl_o>
-  $<TARGET_OBJECTS:er_o>
-  $<TARGET_OBJECTS:kvtree_o>
-  $<TARGET_OBJECTS:rankstr_o>
-  $<TARGET_OBJECTS:redset_o>
-  $<TARGET_OBJECTS:shuffile_o>
-  $<TARGET_OBJECTS:spath_o>
+    $<TARGET_OBJECTS:axl_mpi_o>
+    $<TARGET_OBJECTS:er_o>
+    $<TARGET_OBJECTS:kvtree_o>
+    $<TARGET_OBJECTS:rankstr_o>
+    $<TARGET_OBJECTS:redset_o>
+    $<TARGET_OBJECTS:shuffile_o>
+    $<TARGET_OBJECTS:spath_o>
 )
 
 LIST(APPEND scr_tpl_noMPI_objects
-  $<TARGET_OBJECTS:axl_o>
-  $<TARGET_OBJECTS:kvtree_noMPI_o>
-  $<TARGET_OBJECTS:redset_noMPI_o>
-  $<TARGET_OBJECTS:spath_base_o>
+    $<TARGET_OBJECTS:axl_o>
+    $<TARGET_OBJECTS:kvtree_noMPI_o>
+    $<TARGET_OBJECTS:redset_noMPI_o>
+    $<TARGET_OBJECTS:spath_base_o>
 )
 
 # Install header files