Merge pull request #149 from DARMA-tasking/148-add-fmt-11-support

#148: make vt-tv work with fmt v11

Author: lifflander

CMakeLists.txt

@@ -71,6 +71,7 @@ set(PROJECT_APP_DIR      ${CMAKE_CURRENT_SOURCE_DIR}/apps)
 set(PROJECT_BINDINGS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bindings)
 
 add_subdirectory(src)
+link_openmp()
 add_subdirectory(examples)
 
 add_subdirectory(apps)

cmake/load_openmp.cmake

@@ -8,3 +8,9 @@ else ()
   message(STATUS "Did not find OpenMP")
   set(VT_TV_OPENMP_ENABLED OFF)
 endif()
+
+function(link_openmp)
+  if(VT_TV_OPENMP_ENABLED)
+    target_link_libraries(${VT_TV_LIBRARY} PUBLIC OpenMP::OpenMP_CXX)
+  endif()
+endfunction()

tests/unit/render/test_render.cc

@@ -255,15 +255,10 @@ TEST_P(RenderTest, test_render_from_config_with_png) {
         output_file_stem,
         output_file_stem,
         i);
-      std::vector<std::string> cmd_vars = {
-        fmt::format("ACTUAL={}", png_file),
-        fmt::format("EXPECTED={}", expected_png_file),
-        "TOLERANCE=0.1",
-      };
       auto cmd = fmt::format(
-        "{} {}/tests/test_image.sh",
-        fmt::join(cmd_vars, " "),
-        SRC_DIR
+        "ACTUAL={} EXPECTED={} TOLERANCE=0.1 "
+        "{}/tests/test_image.sh",
+        png_file, expected_png_file, SRC_DIR
       );
       cout << cmd << endl;
       const auto [status, output] = Util::exec(cmd.c_str());
@@ -388,4 +383,4 @@ TEST_F(RenderTest, test_render_construct_from_info) {
   SUCCEED();
 }
 
-} // namespace vt::tv::tests::unit::render
+} // namespace vt::tv::tests::unit::render