removing FindADIOS2.cmake

SCOREC · Jan 25, 2025 · d7a31ea · d7a31ea
1 parent 6abf57a
commit d7a31ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 113 deletions.
diff --git a/cmake/FindADIOS2.cmake b/cmake/FindADIOS2.cmake
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -174,12 +174,7 @@ endif()
 message(STATUS "Omega_h_USE_ADIOS2: ${Omega_h_USE_ADIOS2}")
 if(Omega_h_USE_ADIOS2)
   list(APPEND Omega_h_SOURCES Omega_h_adios2.cpp)
-  #Is there a better way? I assume CMAKE_MODULE_PATH was purposely not set in
-  # the top level CMakeLists.txt
-  set(OLD_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
-  set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/")
-  find_package(ADIOS2 MODULE REQUIRED)
-  set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH})
+  find_package(ADIOS2 REQUIRED)
 endif()
 
 if(Omega_h_USE_SEACASExodus)
@@ -238,11 +233,10 @@ if(Omega_h_USE_SimModSuite)
 endif()
 
 if(Omega_h_USE_ADIOS2)
-  set(ADIOS_REQUIRED_VERSION 2.10)
   if (Omega_h_USE_MPI)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DADIOS2_USE_MPI")
-    target_include_directories(omega_h PUBLIC "${ADIOS2_INCLUDE_DIR}")
-    target_link_libraries(omega_h PUBLIC "${ADIOS2_LIBS}")
+    target_include_directories(omega_h PRIVATE "${ADIOS2_INCLUDE_DIRS}")
+    target_link_libraries(omega_h PUBLIC "${ADIOS2_LIBRARIES}")
   else()
     message("set Omega_h_USE_MPI to use ADIOS2")
   endif()