Merge pull request #1090 from LLNL/bugfix/gunney/cmake-hdf5-variable-…

…name Fix a bad cmake variable name and an error it was hiding.
LLNL · May 19, 2023 · 3f6d553 · 3f6d553
2 parents 26c57ff + 0463be6
commit 3f6d553
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/axom/quest/examples/CMakeLists.txt b/src/axom/quest/examples/CMakeLists.txt
@@ -35,7 +35,7 @@ if(AXOM_ENABLE_MPI AND MFEM_FOUND AND MFEM_USE_MPI
 endif()
 
 # Distributed closest point example -------------------------------------------
-if(AXOM_ENABLE_MPI AND AXOM_ENABLE_SIDRE AND AXOM_ENABLE_HDF5)
+if(AXOM_ENABLE_MPI AND AXOM_ENABLE_SIDRE AND HDF5_FOUND)
     axom_add_executable(
             NAME        quest_distributed_distance_query_ex
             SOURCES     quest_distributed_distance_query_example.cpp

diff --git a/src/axom/quest/examples/quest_distributed_distance_query_example.cpp b/src/axom/quest/examples/quest_distributed_distance_query_example.cpp
@@ -631,7 +631,7 @@ struct BlueprintParticleMesh
 
     auto* fieldsGroup = domainGroup->createGroup("fields");
 
-    domainGroup->createViewScalar<axom::int64>("state/domain_id", m_rank);
+    domainGroup->createViewScalar<std::int64_t>("state/domain_id", m_rank);
 
     m_domainGroups.push_back(domainGroup);
     m_coordsGroups.push_back(coordsGroup);

diff --git a/src/axom/quest/tests/CMakeLists.txt b/src/axom/quest/tests/CMakeLists.txt
@@ -176,10 +176,10 @@ endif()
 cmake_dependent_option(
     AXOM_QUEST_ENABLE_EXTRA_REGRESSION_TESTS
     "Enable extra regression tests for quest" OFF
-    "AXOM_ENABLE_MPI;AXOM_ENABLE_SIDRE;AXOM_DATA_DIR;AXOM_ENABLE_HDF5" OFF )
+    "AXOM_ENABLE_MPI;AXOM_ENABLE_SIDRE;AXOM_DATA_DIR;HDF5_FOUND" OFF )
 mark_as_advanced(AXOM_QUEST_ENABLE_EXTRA_REGRESSION_TESTS)
 
-if (AXOM_ENABLE_MPI AND AXOM_ENABLE_SIDRE AND AXOM_ENABLE_HDF5)
+if (AXOM_ENABLE_MPI AND AXOM_ENABLE_SIDRE AND HDF5_FOUND)
 
     set(quest_regression_depends
         ${quest_tests_depends}