Fixing bug with MPI linking with spack

Author: berrill

CMakeLists.txt

@@ -1,7 +1,7 @@
 # Set some CMake properties
 INCLUDE(CheckCXXCompilerFlag)
 INCLUDE(CheckCXXSourceCompiles)
-CMAKE_MINIMUM_REQUIRED(VERSION 3.9)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.20.0)
 
 
 MESSAGE( "===========================" )
@@ -89,6 +89,7 @@ IF ( ( NOT DEFINED USE_MPI ) OR ( USE_MPI AND NOT MPI_SKIP_SEARCH ) )
     IF ( NOT DEFINED USE_MPI )
         SET( USE_MPI ${MPI_FOUND} )
     ENDIF()
+    SET( USE_FIND_PACKAGE_MPI TRUE )
 ENDIF()
 IF ( USE_MPI )
     IF ( MPI_SKIP_SEARCH )
@@ -130,6 +131,9 @@ IF ( USE_MPI )
     ADD_DEFINITIONS( -DUSE_MPI )
     INCLUDE_DIRECTORIES( ${MPI_CXX_INCLUDE_PATH} )
     SET( SET_USE_MPI "1" )
+    IF ( TARGET MPI::MPI_CXX )
+        SET( MPICXX_LIBS MPI::MPI_CXX )
+    ENDIF()
 ELSE()
     SET( SET_USE_MPI "0" )
 ENDIF()
@@ -212,7 +216,7 @@ ENDIF()
 # Add library
 ADD_LIBRARY( stacktrace ${LIB_TYPE} Utilities.cpp StackTrace.cpp StackTraceThreads.cpp )
 ADD_DEPENDENCIES( stacktrace StackTrace-include )
-TARGET_LINK_LIBRARIES( stacktrace ${CMAKE_DL_LIBS} ${SYSTEM_LIBS} ${TIMER_LIB} )
+TARGET_LINK_LIBRARIES( stacktrace ${CMAKE_DL_LIBS} ${SYSTEM_LIBS} ${TIMER_LIB} ${MPICXX_LIBS} )
 INSTALL( TARGETS stacktrace DESTINATION "${${PROJ}_INSTALL_DIR}/lib" )
 INSTALL( TARGETS stacktrace EXPORT StackTraceTargets DESTINATION "${${PROJ}_INSTALL_DIR}/lib" )
 INSTALL( EXPORT StackTraceTargets

cmake/StackTrace.cmake.in

@@ -9,6 +9,16 @@ SET_AND_CHECK( STACKTRACE_LIB_DIR     "@StackTrace_INSTALL_DIR@/lib"     )
 SET( STACKTRACE_USE_TIMER       @USE_TIMER@ )
 SET( STACKTRACE_TIMER_DIRECTORY @TIMER_DIRECTORY@ )
 
+IF ( @USE_FIND_PACKAGE_MPI@ AND NOT MPI_FOUND )
+    IF ( NOT MPIEXEC_EXECUTABLE )
+        SET( MPIEXEC_EXECUTABLE @MPIEXEC_EXECUTABLE@ )
+    ENDIF()
+    FIND_PACKAGE( MPI )
+ENDIF()
+IF ( TARGET MPI::MPI_CXX )
+    SET( MPICXX_LIBS MPI::MPI_CXX )
+ENDIF()
+
 INCLUDE( "${STACKTRACE_LIB_DIR}/cmake/StackTrace/StackTraceTargets.cmake" )
 INCLUDE_DIRECTORIES( ${STACKTRACE_INCLUDE_DIR} )
 SET( CMAKE_INSTALL_RPATH "${STACKTRACE_LIB_DIR}" ${CMAKE_INSTALL_RPATH} )

cmake/macros.cmake

@@ -159,14 +159,12 @@ FUNCTION( ADD_DISTCLEAN ${ARGN} )
         TPLs.h
         ${ARGN}
     )
-    ADD_CUSTOM_TARGET(distclean @echo cleaning for source distribution)
     IF (UNIX)
-        ADD_CUSTOM_COMMAND(
-            DEPENDS clean
+        ADD_CUSTOM_TARGET(
+            distclean
             COMMENT "distribution clean"
-            COMMAND rm
-            ARGS    -Rf ${DISTCLEANED}
-            TARGET  distclean
+            COMMAND rm -Rf ${DISTCLEANED}
+            WORKING_DIRECTORY "${CMAKE_CURRENT_BUILD_DIR}"
         )
     ELSE()
         SET( DISTCLEANED
@@ -181,11 +179,11 @@ FUNCTION( ADD_DISTCLEAN ${ARGN} )
         APPEND_LIST( "${DISTCLEAN_FILE}" "${DISTCLEANED}" " " " " )
         FILE( APPEND "${DISTCLEAN_FILE}" "\n" )
         APPEND_LIST( "${DISTCLEAN_FILE}" "${DISTCLEANED}" "for /d %%x in ("   ") do rd /s /q \"%%x\"\n" )
-        ADD_CUSTOM_COMMAND(
-            DEPENDS clean
+        ADD_CUSTOM_TARGET(
+            distclean
             COMMENT "distribution clean"
             COMMAND distclean.bat & del /s/q/f distclean.bat
-            TARGET  distclean
+            WORKING_DIRECTORY "${CMAKE_CURRENT_BUILD_DIR}"
         )
     ENDIF()
 ENDFUNCTION()