replace AXOM_SINA_USE_ADIAK with AXOM_USE_ADIAK

LLNL · Jul 11, 2024 · 10dccf7 · 10dccf7
1 parent 820ce9f
commit 10dccf7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 28 deletions.
diff --git a/src/axom/sina/CMakeLists.txt b/src/axom/sina/CMakeLists.txt
@@ -9,22 +9,11 @@
 #------------------------------------------------------------------------------
 # Specify necessary dependencies
 #
-# Note: Sina also optionally depends on Adiak when AXOM_SINA_USE_ADIAK=ON
+# Note: Sina also optionally depends on Adiak when AXOM_USE_ADIAK=ON
 #------------------------------------------------------------------------------
 axom_component_requires(NAME       Sina
                         TPLS       Conduit )
 
-#------------------------------------------------------------------------------
-# Add Sina options
-#------------------------------------------------------------------------------
-cmake_dependent_option( AXOM_SINA_USE_ADIAK "Enables Adiak support in Sina" ON
-                       "AXOM_USE_ADIAK" OFF)
-
-#------------------------------------------------------------------------------
-# Generate Sina config
-#------------------------------------------------------------------------------
-axom_configure_file ( config.hpp.in ${PROJECT_BINARY_DIR}/include/axom/sina/config.hpp )
-
 #------------------------------------------------------------------------------
 # Specify the sina headers/sources
 #------------------------------------------------------------------------------
@@ -57,8 +46,8 @@ set(sina_sources
     )
 
 # Add Adiak header and source
-blt_list_append( TO sina_headers ELEMENTS core/AdiakWriter.hpp IF AXOM_SINA_USE_ADIAK )
-blt_list_append( TO sina_sources ELEMENTS core/AdiakWriter.cpp IF AXOM_SINA_USE_ADIAK )
+blt_list_append( TO sina_headers ELEMENTS core/AdiakWriter.hpp IF AXOM_USE_ADIAK )
+blt_list_append( TO sina_sources ELEMENTS core/AdiakWriter.cpp IF AXOM_USE_ADIAK )
 
 # Add fortran interface for Sina
 if (ENABLE_FORTRAN)
@@ -75,7 +64,7 @@ set(sina_depends
     conduit::conduit
     )
 
-blt_list_append( TO sina_depends ELEMENTS adiak::adiak IF AXOM_SINA_USE_ADIAK )
+blt_list_append( TO sina_depends ELEMENTS adiak::adiak IF AXOM_USE_ADIAK )
 
 axom_add_library(NAME       sina
                  SOURCES    ${sina_sources}
@@ -89,10 +78,6 @@ axom_write_unified_header(NAME    sina
 axom_install_component(NAME    sina
                        HEADERS ${sina_headers})
 
-install(FILES           ${PROJECT_BINARY_DIR}/include/axom/sina/config.hpp
-        DESTINATION     include/axom/sina
-        )
-
 #------------------------------------------------------------------------------
 # Add tests and examples
 #------------------------------------------------------------------------------

diff --git a/src/axom/sina/core/AdiakWriter.cpp b/src/axom/sina/core/AdiakWriter.cpp
@@ -8,7 +8,7 @@
 
 #include "axom/sina/core/AdiakWriter.hpp"
 
-#ifdef AXOM_SINA_USE_ADIAK
+#ifdef AXOM_USE_ADIAK
 
 #include <stdexcept>
 #include <utility>
@@ -269,4 +269,4 @@ void adiakSinaCallback(const char *name, adiak_category_t, const char *subcatego
 }  // end sina namespace
 }  // end axom namespace
 
-#endif // AXOM_SINA_USE_ADIAK
+#endif // AXOM_USE_ADIAK
diff --git a/src/axom/sina/core/AdiakWriter.hpp b/src/axom/sina/core/AdiakWriter.hpp
@@ -9,8 +9,8 @@
 
 /// @file
 
-#include "axom/sina/config.hpp"
-#ifdef AXOM_SINA_USE_ADIAK
+#include "axom/config.hpp"
+#ifdef AXOM_USE_ADIAK
 
 #include <string>
 #include <type_traits>
@@ -50,7 +50,7 @@ void adiakSinaCallback(const char *name, adiak_category_t category, const char *
 }  // end sina namespace
 }  // end axom namespace
 
-#endif // AXOM_SINA_USE_ADIAK
+#endif // AXOM_USE_ADIAK
 
 #endif // SINA_ADIAK_HPP
 
diff --git a/src/axom/sina/tests/CMakeLists.txt b/src/axom/sina/tests/CMakeLists.txt
@@ -75,8 +75,8 @@ if (ENABLE_GMOCK)
         )
 
     # Add tests using Adiak if necessary and Adiak dependency
-    blt_list_append( TO gmock_sina_tests ELEMENTS sina_AdiakWriter.cpp IF AXOM_SINA_USE_ADIAK)
-    blt_list_append( TO sina_gmock_depends_on ELEMENTS adiak::adiak IF AXOM_SINA_USE_ADIAK )
+    blt_list_append( TO gmock_sina_tests ELEMENTS sina_AdiakWriter.cpp IF AXOM_USE_ADIAK)
+    blt_list_append( TO sina_gmock_depends_on ELEMENTS adiak::adiak IF AXOM_USE_ADIAK )
 
     foreach(test ${gmock_sina_tests})
         get_filename_component( test_name ${test} NAME_WE )

diff --git a/src/axom/sina/tests/sina_AdiakWriter.cpp b/src/axom/sina/tests/sina_AdiakWriter.cpp
@@ -6,7 +6,7 @@
 
 #include "axom/sina/core/AdiakWriter.hpp"
 
-#ifdef AXOM_SINA_USE_ADIAK
+#ifdef AXOM_USE_ADIAK
 
 #include <stdexcept>
 #include <string>
@@ -157,4 +157,4 @@ TEST_F(AdiakWriterTest, files_list){
 }  // end sina namespace
 }  // end axom namespace
 
-#endif // AXOM_SINA_USE_ADIAK
+#endif // AXOM_USE_ADIAK