Merge pull request #2324 from DARMA-tasking/2323-cmake-fails-to-confi…

…gure-when-checkpoint-is-present-in-lib #2323: Fix an issue with magistrate target when it's included as a vt's subdirectory
DARMA-tasking · Jul 18, 2024 · 218a219 · 218a219
2 parents 958e26c + 1b520b0
commit 218a219
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/cmake/load_local_packages.cmake b/cmake/load_local_packages.cmake
@@ -7,6 +7,8 @@ include(cmake/local_package.cmake)
 
 if (EXISTS "${PROJECT_LIB_DIR}/checkpoint")
   add_subdirectory(${PROJECT_LIB_DIR}/checkpoint)
+elseif(EXISTS "${PROJECT_LIB_DIR}/magistrate")
+  add_subdirectory(${PROJECT_LIB_DIR}/magistrate)
 else()
   # find these required packages locally
   find_package_local(magistrate)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -316,9 +316,9 @@ export(
   NAMESPACE                 vt::runtime::
 )
 
-if (EXISTS "${PROJECT_LIB_DIR}/checkpoint")
+if (EXISTS "${PROJECT_LIB_DIR}/checkpoint" OR EXISTS "${PROJECT_LIB_DIR}/magistrate")
   install(
-    TARGETS                 checkpoint
+    TARGETS                 magistrate
     EXPORT                  ${VIRTUAL_TRANSPORT_LIBRARY}
   )
 endif()