CMake: Ensure we find ADIOS2 if we downloaded it

boutproject · Jan 24, 2025 · 0590870 · 0590870
1 parent e55611f
commit 0590870
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/bout++Config.cmake.in b/bout++Config.cmake.in
@@ -91,7 +91,7 @@ elseif(EXISTS "@NCXX4_CONFIG@")
   set(NCXX4_CONFIG "@NCXX4_CONFIG@")
 elseif(EXISTS "@NCXX_BINARY_DIR@")
   # If we downloaded netCDF-cxx4, then we need to add its build directory to our search paths
-  list(APPEND CMAKE_PREFIX_PATH "@NCXX_BINARY_DIR@")  
+  list(APPEND CMAKE_PREFIX_PATH "@NCXX_BINARY_DIR@")
 endif()
 if(EXISTS "@PVODE_ROOT@")
   set(PVODE_ROOT "@PVODE_ROOT@")
@@ -103,8 +103,11 @@ endif()
 if(EXISTS "@Libuuid_ROOT@")
   set(Libuuid_ROOT "@Libuuid_ROOT@")
 endif()
-if(EXISTS "@ADIOS2_DIR")
-  set(ADIOS2_DIR "@ADIOS2_DIR")
+if(EXISTS "@ADIOS2_ROOT@")
+  set(ADIOS2_ROOT "@ADIOS2_ROOT@")
+elseif(EXISTS "@ADIOS2_BINARY_DIR@")
+  # If we downloaded ADIOS2, then we need to add its build directory to our search paths
+  list(APPEND CMAKE_PREFIX_PATH "@ADIOS2_BINARY_DIR@")
 endif()
 
 if(@BOUT_USE_SYSTEM_MPARK_VARIANT@)