#2216: Address review comments

DARMA-tasking · Apr 23, 2024 · 0dd8cec · 0dd8cec
1 parent 5069291
commit 0dd8cec
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/cmake/load_bundled_libraries.cmake b/cmake/load_bundled_libraries.cmake
@@ -22,11 +22,13 @@ add_subdirectory(${PROJECT_LIB_DIR}/CLI)
 
 # use included fmt or external one
 if(${vt_external_fmt})
-  # user should provide 'fmt_DIR' to CMake (unless fmt is installed in system libs)
-  if(fmt_DIR)
+  # user should provide 'fmt_DIR' or 'fmt_ROOT' to CMake (unless fmt is installed in system libs)
+  if(fmt_ROOT)
+    message(STATUS "vt_external_fmt = ON. Using fmt located at ${fmt_ROOT}")
+  elseif(fmt_DIR)
     message(STATUS "vt_external_fmt = ON. Using fmt located at ${fmt_DIR}")
   else()
-    message(STATUS "vt_external_fmt = ON but fmt_DIR is not provided!")
+    message(STATUS "vt_external_fmt = ON but neither fmt_DIR nor fmt_ROOT is provided!")
   endif()
   find_package(fmt 7.1.0 REQUIRED)
 

diff --git a/cmake/vtConfig.cmake.in b/cmake/vtConfig.cmake.in
@@ -26,4 +26,9 @@ endif()
 set (VT_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/include")
 set (VT_CXX_COMPILER "@CMAKE_CXX_COMPILER@")
 
+if (@vt_external_fmt@)
+  set (fmt_DIR @fmt_DIR@)
+  find_dependency(fmt REQUIRED HINTS @fmt_DIR@)
+endif()
+
 set(VT_HAS_FMT "TRUE")