From 4f2d383f92b0ce84a49668d3cdf49bc5af71b206 Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Mon, 19 Jun 2017 14:46:09 -0400
Subject: [PATCH] CMake: Use ADIOS2_ prefix for options instead of ADIOS_

---
 CMakeLists.txt                                | 36 ++++-----
 bindings/CMakeLists.txt                       |  2 +-
 bindings/python/CMakeLists.txt                |  6 +-
 cmake/ADIOSFunctions.cmake                    | 10 +--
 cmake/DetectOptions.cmake                     | 74 +++++++++----------
 examples/basics/globalArray/CMakeLists.txt    |  2 +-
 examples/basics/joinedArray/CMakeLists.txt    |  2 +-
 examples/basics/localArray/CMakeLists.txt     |  2 +-
 examples/basics/values/CMakeLists.txt         |  2 +-
 examples/experimental/CMakeLists.txt          |  2 +-
 .../experimental/multistep/CMakeLists.txt     |  2 +-
 examples/heatTransfer/CMakeLists.txt          |  2 +-
 examples/heatTransfer/read/CMakeLists.txt     |  4 +-
 examples/heatTransfer/write/CMakeLists.txt    | 10 +--
 examples/hello/CMakeLists.txt                 |  6 +-
 examples/hello/adios1Writer/CMakeLists.txt    |  2 +-
 examples/hello/bpFlushWriter/CMakeLists.txt   |  2 +-
 examples/hello/bpTimeWriter/CMakeLists.txt    |  2 +-
 examples/hello/bpWriter/CMakeLists.txt        |  2 +-
 examples/hello/datamanReader/CMakeLists.txt   |  2 +-
 examples/hello/datamanWriter/CMakeLists.txt   |  2 +-
 examples/hello/hdf5Writer/CMakeLists.txt      |  2 +-
 source/CMakeLists.txt                         |  2 +-
 source/adios2/CMakeLists.txt                  | 24 +++---
 source/dataman/CMakeLists.txt                 |  4 +-
 testing/adios2/engine/CMakeLists.txt          |  8 +-
 testing/adios2/engine/adios1/CMakeLists.txt   |  2 +-
 testing/adios2/engine/bp/CMakeLists.txt       |  2 +-
 thirdparty/CMakeLists.txt                     |  2 +-
 thirdparty/KWSys/CMakeLists.txt               |  2 +-
 30 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6dde11a35..d97a54ebe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR)
     "separate from the source directory")
 endif()
 
-project(ADIOS VERSION 2.0.0)
+project(ADIOS2 VERSION 2.0.0)
 
 #------------------------------------------------------------------------------#
 # Some boilerplate to setup nice output directories
@@ -20,18 +20,18 @@ project(ADIOS VERSION 2.0.0)
 
 include(GNUInstallDirs)
 
-list(INSERT CMAKE_MODULE_PATH 0 "${ADIOS_SOURCE_DIR}/cmake")
+list(INSERT CMAKE_MODULE_PATH 0 "${ADIOS2_SOURCE_DIR}/cmake")
 if(NOT CMAKE_ARCHIVE_OUTPUT_DIRECTORY)
   set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
-    ${ADIOS_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
+    ${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
 endif()
 if(NOT CMAKE_LIBRARY_OUTPUT_DIRECTORY)
   set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
-    ${ADIOS_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
+    ${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
 endif()
 if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY
-    ${ADIOS_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
+    ${ADIOS2_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
 endif()
 
 #------------------------------------------------------------------------------#
@@ -52,15 +52,15 @@ include(CMakeDependentOption)
 
 # Setup shared library / -fPIC stuff
 get_property(SHARED_LIBS_SUPPORTED GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
-cmake_dependent_option(ADIOS_BUILD_SHARED_LIBS
+cmake_dependent_option(ADIOS2_BUILD_SHARED_LIBS
   "Whether or not to build shared libraries" ON
   "SHARED_LIBS_SUPPORTED" OFF)
-cmake_dependent_option(ADIOS_ENABLE_PIC
+cmake_dependent_option(ADIOS2_ENABLE_PIC
   "Build with Position Independent Code" ON
   "SHARED_LIBS_SUPPORTED" OFF)
-set(BUILD_SHARED_LIBS ${ADIOS_BUILD_SHARED_LIBS})
+set(BUILD_SHARED_LIBS ${ADIOS2_BUILD_SHARED_LIBS})
 
-if(ADIOS_ENABLE_PIC)
+if(ADIOS2_ENABLE_PIC)
   set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 endif()
 
@@ -72,24 +72,24 @@ adios_option(ZeroMQ  "Enable support for ZeroMQ" AUTO)
 adios_option(HDF5    "Enable support for the HDF5 engine" AUTO)
 adios_option(ADIOS1  "Enable support for the ADIOS 1 engine" AUTO)
 adios_option(Python  "Enable support for Python bindings" AUTO)
-include(${ADIOS_SOURCE_DIR}/cmake/DetectOptions.cmake)
+include(${ADIOS2_SOURCE_DIR}/cmake/DetectOptions.cmake)
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   # Workaround for OpenMPI forcing the link of C++ bindings
   add_definitions(-DOMPI_SKIP_MPICXX)
 endif()
 
 GenerateADIOSConfig(MPI ZFP BZip2 ADIOS1 HDF5 DataMan Python)
 install(
-  FILES ${ADIOS_BINARY_DIR}/adios2/ADIOSConfig.h
+  FILES ${ADIOS2_BINARY_DIR}/adios2/ADIOSConfig.h
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/adios2
 )
 
 #------------------------------------------------------------------------------#
 # Third party libraries
 #------------------------------------------------------------------------------#
-option(ADIOS_BUILD_TESTING "Build ADIOS tests" ON)
-set(BUILD_TESTING ${ADIOS_BUILD_TESTING})
+option(ADIOS2_BUILD_TESTING "Build ADIOS tests" ON)
+set(BUILD_TESTING ${ADIOS2_BUILD_TESTING})
 mark_as_advanced(BUILD_TESTING)
 include(CTest)
 add_subdirectory(thirdparty)
@@ -107,8 +107,8 @@ add_subdirectory(bindings)
 #------------------------------------------------------------------------------#
 # Examples
 #------------------------------------------------------------------------------#
-option(ADIOS_BUILD_EXAMPLES "Build ADIOS examples" ON)
-if(ADIOS_BUILD_EXAMPLES)
+option(ADIOS2_BUILD_EXAMPLES "Build ADIOS examples" ON)
+if(ADIOS2_BUILD_EXAMPLES)
   add_subdirectory(examples)
 endif()
 
@@ -126,7 +126,7 @@ endif()
 #------------------------------------------------------------------------------#
 message("")
 message("ADIOS2 build configuration:")
-message("  ADIOS Version: ${ADIOS_VERSION}")
+message("  ADIOS Version: ${ADIOS2_VERSION}")
 message("  C++ Compiler : ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} ${CMAKE_CXX_COMPILER_WRAPPER}")
 message("    ${CMAKE_CXX_COMPILER}")
 message("")
@@ -142,7 +142,7 @@ message("    Testing: ${BUILD_TESTING}")
 message("    Build Options:")
 foreach(opt BZip2 ZFP MPI DataMan ZeroMQ HDF5 ADIOS1 Python)
   message_pad("      ${opt}" 13 label)
-  if(${ADIOS_HAVE_${opt}})
+  if(${ADIOS2_HAVE_${opt}})
     message("${label}: ON")
   else()
     message("${label}: OFF")
diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index 525ffce4e..c21b8b329 100644
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -1,3 +1,3 @@
-if(ADIOS_HAVE_Python)
+if(ADIOS2_HAVE_Python)
   add_subdirectory(python)
 endif()
diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt
index dfbe163dd..d508c8a70 100644
--- a/bindings/python/CMakeLists.txt
+++ b/bindings/python/CMakeLists.txt
@@ -18,7 +18,7 @@ pybind11_add_module(adios2py MODULE
   VariablePy.cpp
 )
 target_link_libraries(adios2py PRIVATE adios2)
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(PythonModule REQUIRED COMPONENTS mpi4py mpi4py/mpi4py.h)
   target_link_libraries(adios2py PRIVATE PythonModule::mpi4py)
 endif()
@@ -29,8 +29,8 @@ set_target_properties(adios2py PROPERTIES
   OUTPUT_NAME adios2
   PREFIX "${PYTHON_MODULE_PREFIX}"
   SUFFIX "${PYTHON_MODULE_EXTENSION}"
-  LIBRARY_OUTPUT_DIRECTORY ${ADIOS_BINARY_DIR}/${python_package_dir}
-  RUNTIME_OUTPUT_DIRECTORY ${ADIOS_BINARY_DIR}/${python_package_dir}
+  LIBRARY_OUTPUT_DIRECTORY ${ADIOS2_BINARY_DIR}/${python_package_dir}
+  RUNTIME_OUTPUT_DIRECTORY ${ADIOS2_BINARY_DIR}/${python_package_dir}
 )
 install(TARGETS adios2py
   DESTINATION ${python_package_dir}
diff --git a/cmake/ADIOSFunctions.cmake b/cmake/ADIOSFunctions.cmake
index 7791e47d3..b0f6cb8e6 100644
--- a/cmake/ADIOSFunctions.cmake
+++ b/cmake/ADIOSFunctions.cmake
@@ -6,7 +6,7 @@
 function(GenerateADIOSConfig)
   foreach(OPT IN LISTS ARGN)
     string(TOUPPER ${OPT} OPT_UPPER)
-    if(ADIOS_HAVE_${OPT})
+    if(ADIOS2_HAVE_${OPT})
       set(ADIOS2_HAVE_${OPT_UPPER} 1)
     else()
       set(ADIOS2_HAVE_${OPT_UPPER})
@@ -14,14 +14,14 @@ function(GenerateADIOSConfig)
   endforeach()
 
   configure_file(
-    ${ADIOS_SOURCE_DIR}/source/adios2/ADIOSConfig.h.in
-    ${ADIOS_BINARY_DIR}/adios2/ADIOSConfig.h
+    ${ADIOS2_SOURCE_DIR}/source/adios2/ADIOSConfig.h.in
+    ${ADIOS2_BINARY_DIR}/adios2/ADIOSConfig.h
   )
 endfunction()
 
 function(adios_option name description default)
-  set(ADIOS_USE_${name} ${default} CACHE STRING "${description}")
-  set_property(CACHE ADIOS_USE_${name} PROPERTY
+  set(ADIOS2_USE_${name} ${default} CACHE STRING "${description}")
+  set_property(CACHE ADIOS2_USE_${name} PROPERTY
     STRINGS "ON;TRUE;AUTO;OFF;FALSE"
   )
 endfunction()
diff --git a/cmake/DetectOptions.cmake b/cmake/DetectOptions.cmake
index fd02ef97f..e4f366cf5 100644
--- a/cmake/DetectOptions.cmake
+++ b/cmake/DetectOptions.cmake
@@ -10,95 +10,95 @@
 # dependencies is an error,
 
 # BZip2
-if(ADIOS_USE_BZip2 STREQUAL AUTO)
+if(ADIOS2_USE_BZip2 STREQUAL AUTO)
   find_package(BZip2)
   if(BZIP2_FOUND)
-    set(ADIOS_HAVE_BZip2 TRUE)
+    set(ADIOS2_HAVE_BZip2 TRUE)
   endif()
-elseif(ADIOS_USE_BZip2)
-  set(ADIOS_HAVE_BZip2 TRUE)
+elseif(ADIOS2_USE_BZip2)
+  set(ADIOS2_HAVE_BZip2 TRUE)
 endif()
 
 # ZFP
-if(ADIOS_USE_ZFP STREQUAL AUTO)
+if(ADIOS2_USE_ZFP STREQUAL AUTO)
   find_package(ZFP)
   if(ZFP_FOUND)
-    set(ADIOS_HAVE_ZFP TRUE)
+    set(ADIOS2_HAVE_ZFP TRUE)
   endif()
-elseif(ADIOS_USE_ZFP)
-  set(ADIOS_HAVE_ZFP TRUE)
+elseif(ADIOS2_USE_ZFP)
+  set(ADIOS2_HAVE_ZFP TRUE)
 endif()
 
 # MPI
-if(ADIOS_USE_MPI STREQUAL AUTO)
+if(ADIOS2_USE_MPI STREQUAL AUTO)
   find_package(MPI COMPONENTS C)
   if(MPI_FOUND)
-    set(ADIOS_HAVE_MPI TRUE)
+    set(ADIOS2_HAVE_MPI TRUE)
   endif()
-elseif(ADIOS_USE_MPI)
-  set(ADIOS_HAVE_MPI TRUE)
+elseif(ADIOS2_USE_MPI)
+  set(ADIOS2_HAVE_MPI TRUE)
 endif()
 
 # DataMan
-if(ADIOS_USE_DataMan STREQUAL AUTO)
+if(ADIOS2_USE_DataMan STREQUAL AUTO)
   if(SHARED_LIBS_SUPPORTED AND NOT MSVC)
-    set(ADIOS_HAVE_DataMan TRUE)
+    set(ADIOS2_HAVE_DataMan TRUE)
   endif()
-elseif(ADIOS_USE_DataMan)
-  set(ADIOS_HAVE_DataMan TRUE)
+elseif(ADIOS2_USE_DataMan)
+  set(ADIOS2_HAVE_DataMan TRUE)
 endif()
 
 # ZeroMQ
-if(ADIOS_USE_ZeroMQ STREQUAL AUTO)
+if(ADIOS2_USE_ZeroMQ STREQUAL AUTO)
   find_package(ZeroMQ)
   if(ZeroMQ_FOUND)
-    set(ADIOS_HAVE_ZeroMQ TRUE)
+    set(ADIOS2_HAVE_ZeroMQ TRUE)
   endif()
-elseif(ADIOS_USE_ZeroMQ)
-  set(ADIOS_HAVE_ZeroMQ TRUE)
+elseif(ADIOS2_USE_ZeroMQ)
+  set(ADIOS2_HAVE_ZeroMQ TRUE)
 endif()
 
 # HDF5
-if(ADIOS_USE_HDF5 STREQUAL AUTO)
+if(ADIOS2_USE_HDF5 STREQUAL AUTO)
   find_package(HDF5 COMPONENTS C)
   if(HDF5_FOUND AND
-     ((ADIOS_HAVE_MPI AND HDF5_IS_PARALLEL) OR
-      NOT (ADIOS_HAVE_MPI OR HDF5_IS_PARALLEL)))
-    set(ADIOS_HAVE_HDF5 TRUE)
+     ((ADIOS2_HAVE_MPI AND HDF5_IS_PARALLEL) OR
+      NOT (ADIOS2_HAVE_MPI OR HDF5_IS_PARALLEL)))
+    set(ADIOS2_HAVE_HDF5 TRUE)
   endif()
-elseif(ADIOS_USE_HDF5)
-  set(ADIOS_HAVE_HDF5 TRUE)
+elseif(ADIOS2_USE_HDF5)
+  set(ADIOS2_HAVE_HDF5 TRUE)
 endif()
 
 # ADIOS1
-if(ADIOS_USE_ADIOS1 STREQUAL AUTO)
-  if(NOT ADIOS_HAVE_MPI)
+if(ADIOS2_USE_ADIOS1 STREQUAL AUTO)
+  if(NOT ADIOS2_HAVE_MPI)
     set(adios1_args COMPONENTS sequential)
   endif()
   find_package(ADIOS1 1.12.0 ${adios1_args})
   unset(adios1_args)
   if(ADIOS1_FOUND)
-    set(ADIOS_HAVE_ADIOS1 TRUE)
+    set(ADIOS2_HAVE_ADIOS1 TRUE)
   endif()
-elseif(ADIOS_USE_ADIOS1)
-  set(ADIOS_HAVE_ADIOS1 TRUE)
+elseif(ADIOS2_USE_ADIOS1)
+  set(ADIOS2_HAVE_ADIOS1 TRUE)
 endif()
 
 # Python
-if(ADIOS_USE_Python STREQUAL AUTO)
+if(ADIOS2_USE_Python STREQUAL AUTO)
   if(BUILD_SHARED_LIBS)
     find_package(PythonLibs)
     if(PYTHONLIBS_FOUND)
-      if(ADIOS_HAVE_MPI)
+      if(ADIOS2_HAVE_MPI)
         find_package(PythonModule COMPONENTS mpi4py mpi4py/mpi4py.h)
         if(PythonModule_mpi4py_FOUND)
-          set(ADIOS_HAVE_Python TRUE)
+          set(ADIOS2_HAVE_Python TRUE)
         endif()
       else()
-        set(ADIOS_HAVE_Python TRUE)
+        set(ADIOS2_HAVE_Python TRUE)
       endif()
     endif()
   endif()
-elseif(ADIOS_USE_Python)
-  set(ADIOS_HAVE_Python TRUE)
+elseif(ADIOS2_USE_Python)
+  set(ADIOS2_HAVE_Python TRUE)
 endif()
diff --git a/examples/basics/globalArray/CMakeLists.txt b/examples/basics/globalArray/CMakeLists.txt
index db0517543..f9a9b07dd 100644
--- a/examples/basics/globalArray/CMakeLists.txt
+++ b/examples/basics/globalArray/CMakeLists.txt
@@ -6,7 +6,7 @@
 add_executable(globalArray_write globalArray_write.cpp)
 target_link_libraries(globalArray_write adios2)
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(MPI COMPONENTS C REQUIRED)
   target_include_directories(globalArray_write PRIVATE ${MPI_C_INCLUDE_PATH})
   target_link_libraries(globalArray_write ${MPI_C_LIBRARIES})
diff --git a/examples/basics/joinedArray/CMakeLists.txt b/examples/basics/joinedArray/CMakeLists.txt
index 2ce60496e..f8d775e84 100644
--- a/examples/basics/joinedArray/CMakeLists.txt
+++ b/examples/basics/joinedArray/CMakeLists.txt
@@ -6,7 +6,7 @@
 add_executable(joinedArray_write joinedArray_write.cpp)
 target_link_libraries(joinedArray_write adios2)
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(MPI COMPONENTS C REQUIRED)
   target_include_directories(joinedArray_write PRIVATE ${MPI_C_INCLUDE_PATH})
   target_link_libraries(joinedArray_write ${MPI_C_LIBRARIES})
diff --git a/examples/basics/localArray/CMakeLists.txt b/examples/basics/localArray/CMakeLists.txt
index d3d0edf14..3f46669a6 100644
--- a/examples/basics/localArray/CMakeLists.txt
+++ b/examples/basics/localArray/CMakeLists.txt
@@ -6,7 +6,7 @@
 add_executable(localArray_write localArray_write.cpp)
 target_link_libraries(localArray_write adios2)
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(MPI COMPONENTS C REQUIRED)
   target_include_directories(localArray_write PRIVATE ${MPI_C_INCLUDE_PATH})
   target_link_libraries(localArray_write ${MPI_C_LIBRARIES})
diff --git a/examples/basics/values/CMakeLists.txt b/examples/basics/values/CMakeLists.txt
index b2aefa0e5..619fdc326 100644
--- a/examples/basics/values/CMakeLists.txt
+++ b/examples/basics/values/CMakeLists.txt
@@ -6,7 +6,7 @@
 add_executable(values_write values_write.cpp)
 target_link_libraries(values_write adios2)
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(MPI COMPONENTS C REQUIRED)
   target_include_directories(values_write PRIVATE ${MPI_C_INCLUDE_PATH})
   target_link_libraries(values_write ${MPI_C_LIBRARIES})
diff --git a/examples/experimental/CMakeLists.txt b/examples/experimental/CMakeLists.txt
index a02ded2b5..95b0ee655 100644
--- a/examples/experimental/CMakeLists.txt
+++ b/examples/experimental/CMakeLists.txt
@@ -3,6 +3,6 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-if(ADIOS_HAVE_ADIOS1)
+if(ADIOS2_HAVE_ADIOS1)
   add_subdirectory(multistep)
 endif()
diff --git a/examples/experimental/multistep/CMakeLists.txt b/examples/experimental/multistep/CMakeLists.txt
index 1bafddf2c..b5f75bb22 100644
--- a/examples/experimental/multistep/CMakeLists.txt
+++ b/examples/experimental/multistep/CMakeLists.txt
@@ -10,7 +10,7 @@ target_link_libraries(writer_multistep adios2)
 target_link_libraries(reader_stepping adios2)
 target_link_libraries(reader_allsteps adios2)
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(MPI COMPONENTS C REQUIRED)
 
   target_include_directories(writer_multistep PRIVATE ${MPI_C_INCLUDE_PATH})
diff --git a/examples/heatTransfer/CMakeLists.txt b/examples/heatTransfer/CMakeLists.txt
index 9b1e0533d..86a5f7fb2 100644
--- a/examples/heatTransfer/CMakeLists.txt
+++ b/examples/heatTransfer/CMakeLists.txt
@@ -4,7 +4,7 @@
 #------------------------------------------------------------------------------#
 
 
-if(ADIOS_HAVE_ADIOS1)
+if(ADIOS2_HAVE_ADIOS1)
   add_subdirectory(write)
   add_subdirectory(read)
 endif()
diff --git a/examples/heatTransfer/read/CMakeLists.txt b/examples/heatTransfer/read/CMakeLists.txt
index ddb8c0269..ce72b19ab 100644
--- a/examples/heatTransfer/read/CMakeLists.txt
+++ b/examples/heatTransfer/read/CMakeLists.txt
@@ -3,7 +3,7 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
 
     find_package(MPI COMPONENTS C REQUIRED)
     add_executable(heatTransfer_read_adios2 heatRead_adios2.cpp PrintData.cpp)
@@ -14,7 +14,7 @@ if(ADIOS_HAVE_MPI)
       adios2 ${MPI_C_LIBRARIES}
     )
     
-  if(ADIOS_HAVE_ADIOS1)
+  if(ADIOS2_HAVE_ADIOS1)
     find_package(ADIOS1 REQUIRED)
 
     add_executable(heatTransfer_read_adios1 heatRead_adios1.cpp PrintData.cpp)
diff --git a/examples/heatTransfer/write/CMakeLists.txt b/examples/heatTransfer/write/CMakeLists.txt
index 877267940..426c51240 100644
--- a/examples/heatTransfer/write/CMakeLists.txt
+++ b/examples/heatTransfer/write/CMakeLists.txt
@@ -3,7 +3,7 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(MPI COMPONENTS C REQUIRED)
 
   add_executable(heatTransfer_write_adios2
@@ -17,7 +17,7 @@ if(ADIOS_HAVE_MPI)
   )
   target_link_libraries(heatTransfer_write_adios2 adios2 ${MPI_C_LIBRARIES})
 
-  if(ADIOS_HAVE_ADIOS1)
+  if(ADIOS2_HAVE_ADIOS1)
     find_package(ADIOS1 REQUIRED)
     find_package(MPI COMPONENTS C REQUIRED)
 
@@ -35,7 +35,7 @@ if(ADIOS_HAVE_MPI)
     )
   endif()
 
-  if(ADIOS_HAVE_HDF5)
+  if(ADIOS2_HAVE_HDF5)
     find_package(HDF5 REQUIRED)
     find_package(MPI COMPONENTS C REQUIRED)
 
@@ -54,7 +54,7 @@ if(ADIOS_HAVE_MPI)
   endif()
 
 
-  if(ADIOS_HAVE_HDF5)
+  if(ADIOS2_HAVE_HDF5)
     find_package(HDF5 REQUIRED)
     find_package(MPI COMPONENTS C REQUIRED)
 
@@ -73,7 +73,7 @@ if(ADIOS_HAVE_MPI)
   endif()
 
 
-  if(ADIOS_HAVE_HDF5)
+  if(ADIOS2_HAVE_HDF5)
      find_package(MPI COMPONENTS C REQUIRED)
 
      add_executable(heatTransfer_write_a2h5
diff --git a/examples/hello/CMakeLists.txt b/examples/hello/CMakeLists.txt
index ae04105ea..43b9e6a4b 100644
--- a/examples/hello/CMakeLists.txt
+++ b/examples/hello/CMakeLists.txt
@@ -7,15 +7,15 @@ add_subdirectory(bpWriter)
 add_subdirectory(bpTimeWriter)
 add_subdirectory(bpFlushWriter)
 
-if(ADIOS_HAVE_ADIOS1)
+if(ADIOS2_HAVE_ADIOS1)
   add_subdirectory(adios1Writer)
 endif()
 
-if(ADIOS_HAVE_DataMan)
+if(ADIOS2_HAVE_DataMan)
   add_subdirectory(datamanReader)
   add_subdirectory(datamanWriter)
 endif()
 
-if(ADIOS_HAVE_HDF5)
+if(ADIOS2_HAVE_HDF5)
   add_subdirectory(hdf5Writer)
 endif()
diff --git a/examples/hello/adios1Writer/CMakeLists.txt b/examples/hello/adios1Writer/CMakeLists.txt
index 61e73e20a..f8e52ae9d 100644
--- a/examples/hello/adios1Writer/CMakeLists.txt
+++ b/examples/hello/adios1Writer/CMakeLists.txt
@@ -3,7 +3,7 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(MPI COMPONENTS C REQUIRED)
 
   add_executable(hello_adios1Writer helloADIOS1Writer.cpp)
diff --git a/examples/hello/bpFlushWriter/CMakeLists.txt b/examples/hello/bpFlushWriter/CMakeLists.txt
index 74027445e..ed554a4b4 100644
--- a/examples/hello/bpFlushWriter/CMakeLists.txt
+++ b/examples/hello/bpFlushWriter/CMakeLists.txt
@@ -3,7 +3,7 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(MPI COMPONENTS C REQUIRED)
 
   add_executable(hello_bpFlushWriter helloBPFlushWriter.cpp)
diff --git a/examples/hello/bpTimeWriter/CMakeLists.txt b/examples/hello/bpTimeWriter/CMakeLists.txt
index 3aad83273..30551c498 100644
--- a/examples/hello/bpTimeWriter/CMakeLists.txt
+++ b/examples/hello/bpTimeWriter/CMakeLists.txt
@@ -3,7 +3,7 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(MPI COMPONENTS C REQUIRED)
 
   add_executable(hello_bpTimeWriter helloBPTimeWriter.cpp)
diff --git a/examples/hello/bpWriter/CMakeLists.txt b/examples/hello/bpWriter/CMakeLists.txt
index 56c647c17..a3d4cd35a 100644
--- a/examples/hello/bpWriter/CMakeLists.txt
+++ b/examples/hello/bpWriter/CMakeLists.txt
@@ -3,7 +3,7 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(MPI COMPONENTS C REQUIRED)
 
   add_executable(hello_bpWriter helloBPWriter.cpp)
diff --git a/examples/hello/datamanReader/CMakeLists.txt b/examples/hello/datamanReader/CMakeLists.txt
index cb54e206c..f180c9062 100644
--- a/examples/hello/datamanReader/CMakeLists.txt
+++ b/examples/hello/datamanReader/CMakeLists.txt
@@ -3,7 +3,7 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(MPI COMPONENTS C REQUIRED)
 
   add_executable(hello_datamanReader helloDataManReader.cpp)
diff --git a/examples/hello/datamanWriter/CMakeLists.txt b/examples/hello/datamanWriter/CMakeLists.txt
index 001e8c389..3e5c95583 100644
--- a/examples/hello/datamanWriter/CMakeLists.txt
+++ b/examples/hello/datamanWriter/CMakeLists.txt
@@ -3,7 +3,7 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(MPI COMPONENTS C REQUIRED)
   
   add_executable(hello_datamanWriter helloDataManWriter.cpp)
diff --git a/examples/hello/hdf5Writer/CMakeLists.txt b/examples/hello/hdf5Writer/CMakeLists.txt
index e0dc7a124..a2f7e6abd 100644
--- a/examples/hello/hdf5Writer/CMakeLists.txt
+++ b/examples/hello/hdf5Writer/CMakeLists.txt
@@ -3,7 +3,7 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(MPI COMPONENTS C REQUIRED)
 
   add_executable(hello_hdf5Writer helloHDF5Writer.cpp)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 2943c178a..9a02a7534 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -3,7 +3,7 @@
 # accompanying file Copyright.txt for details.
 #------------------------------------------------------------------------------#
   
-if(ADIOS_HAVE_DataMan)
+if(ADIOS2_HAVE_DataMan)
   add_subdirectory(dataman)
 endif()
 
diff --git a/source/adios2/CMakeLists.txt b/source/adios2/CMakeLists.txt
index f182f8bc4..7617d7b83 100644
--- a/source/adios2/CMakeLists.txt
+++ b/source/adios2/CMakeLists.txt
@@ -45,16 +45,16 @@ add_library(adios2
 )
 target_include_directories(adios2
   PUBLIC
-    $<BUILD_INTERFACE:${ADIOS_SOURCE_DIR}/source>
-    $<BUILD_INTERFACE:${ADIOS_BINARY_DIR}>
+    $<BUILD_INTERFACE:${ADIOS2_SOURCE_DIR}/source>
+    $<BUILD_INTERFACE:${ADIOS2_BINARY_DIR}>
     $<INSTALL_INTERFACE:include>
-  PRIVATE ${ADIOS_SOURCE_DIR}/source
+  PRIVATE ${ADIOS2_SOURCE_DIR}/source
 )
 
 find_package(Threads REQUIRED)
 target_link_libraries(adios2 PUBLIC ${CMAKE_THREAD_LIBS_INIT})
 
-if(ADIOS_HAVE_DataMan)
+if(ADIOS2_HAVE_DataMan)
   target_sources(adios2 PRIVATE
     engine/dataman/DataManReader.cpp
     engine/dataman/DataManWriter.cpp
@@ -62,20 +62,20 @@ if(ADIOS_HAVE_DataMan)
   target_link_libraries(adios2 PRIVATE dataman)
 endif()
   
-if(ADIOS_HAVE_BZip2)
+if(ADIOS2_HAVE_BZip2)
   find_package(BZip2 REQUIRED)
   target_sources(adios2 PRIVATE transform/compression/BZip2.cpp)
   target_link_libraries(adios2 PRIVATE BZip2::BZip2)
 endif()
 
-if(ADIOS_HAVE_ZFP)
+if(ADIOS2_HAVE_ZFP)
   find_package(ZFP REQUIRED)
   message("ADIOS ZFP support not yet implemented")
 #  target_sources(adios2 PRIVATE transform/compression/ZFP.cpp)
 #  target_link_libraries(adios2 PRIVATE zfp::zfp)
 endif()
 
-if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_MPI)
   find_package(MPI COMPONENTS C REQUIRED)
   target_include_directories(adios2 PUBLIC ${MPI_C_INCLUDE_PATH})
   target_link_libraries(adios2 PUBLIC ${MPI_C_LIBRARIES})
@@ -83,8 +83,8 @@ else()
   target_sources(adios2 PRIVATE mpidummy.cpp)
 endif()
 
-if(ADIOS_HAVE_ADIOS1)
-  if(ADIOS_HAVE_MPI)
+if(ADIOS2_HAVE_ADIOS1)
+  if(ADIOS2_HAVE_MPI)
     find_package(ADIOS1 1.12.0 REQUIRED)
   else()
     find_package(ADIOS1 1.12.0 COMPONENTS sequential REQUIRED)
@@ -100,14 +100,14 @@ if(ADIOS_HAVE_ADIOS1)
   target_link_libraries(adios2 PRIVATE adios1::adios)
 endif()
 
-if(ADIOS_HAVE_HDF5)
+if(ADIOS2_HAVE_HDF5)
   find_package(HDF5 REQUIRED)
-  if(ADIOS_HAVE_MPI AND (NOT HDF5_IS_PARALLEL))
+  if(ADIOS2_HAVE_MPI AND (NOT HDF5_IS_PARALLEL))
     message(FATAL_ERROR
       "A sequential version of HDF5 was detected but the parallel version "
       "of ADIOS is being built, which requires a parallel HDF5."
     )
-  elseif((NOT ADIOS_HAVE_MPI) AND HDF5_IS_PARALLEL)
+  elseif((NOT ADIOS2_HAVE_MPI) AND HDF5_IS_PARALLEL)
     message(FATAL_ERROR
       "A parallel version of HDF5 was detected but the sequential version "
       "of ADIOS is being built, which requires a sequential HDF5."
diff --git a/source/dataman/CMakeLists.txt b/source/dataman/CMakeLists.txt
index a5d4b6ab8..4387f9569 100644
--- a/source/dataman/CMakeLists.txt
+++ b/source/dataman/CMakeLists.txt
@@ -36,7 +36,7 @@ add_library(temporalman MODULE TemporalMan.h TemporalMan.cpp)
 target_link_libraries(temporalman PRIVATE dataman)
 list(APPEND dataman_targets temporalman)
 
-if(ADIOS_HAVE_ZeroMQ)
+if(ADIOS2_HAVE_ZeroMQ)
   find_package(ZeroMQ REQUIRED)
 
   add_library(zmqman MODULE
@@ -55,7 +55,7 @@ if(ADIOS_HAVE_ZeroMQ)
 endif()
 
 
-if(ADIOS_HAVE_ZFP)
+if(ADIOS2_HAVE_ZFP)
   find_package(ZFP REQUIRED)
 
   add_library(zfpman MODULE ZfpMan.h ZfpMan.cpp)
diff --git a/testing/adios2/engine/CMakeLists.txt b/testing/adios2/engine/CMakeLists.txt
index 0b87d3cb2..1992d27f7 100644
--- a/testing/adios2/engine/CMakeLists.txt
+++ b/testing/adios2/engine/CMakeLists.txt
@@ -5,18 +5,18 @@
 
 # We currently require ADIOS1 to test ADIOS v2 bp functionality since the read
 # API is not available yet
-if(ADIOS_HAVE_ADIOS1)
+if(ADIOS2_HAVE_ADIOS1)
   add_subdirectory(bp)
 endif()
 
-if(ADIOS_HAVE_ADIOS1)
+if(ADIOS2_HAVE_ADIOS1)
   add_subdirectory(adios1)
 endif()
 
-if(ADIOS_HAVE_HDF5)
+if(ADIOS2_HAVE_HDF5)
   add_subdirectory(hdf5)
 endif()
 
-if(ADIOS_HAVE_DataMan)
+if(ADIOS2_HAVE_DataMan)
   add_subdirectory(dataman)
 endif()
diff --git a/testing/adios2/engine/adios1/CMakeLists.txt b/testing/adios2/engine/adios1/CMakeLists.txt
index 43c743504..259a2aed0 100644
--- a/testing/adios2/engine/adios1/CMakeLists.txt
+++ b/testing/adios2/engine/adios1/CMakeLists.txt
@@ -4,7 +4,7 @@
 #------------------------------------------------------------------------------#
 
 # MPI versions of the test are not properly implemented at the moment
-if(NOT ADIOS_HAVE_MPI)
+if(NOT ADIOS2_HAVE_MPI)
   find_package(ADIOS1 COMPONENTS sequential REQUIRED)
 
   add_executable(TestADIOS1WriteRead TestADIOS1WriteRead.cpp)
diff --git a/testing/adios2/engine/bp/CMakeLists.txt b/testing/adios2/engine/bp/CMakeLists.txt
index ff6ac251d..6a0070554 100644
--- a/testing/adios2/engine/bp/CMakeLists.txt
+++ b/testing/adios2/engine/bp/CMakeLists.txt
@@ -4,7 +4,7 @@
 #------------------------------------------------------------------------------#
 
 # MPI versions of the test are not properly implemented at the moment
-if(NOT ADIOS_HAVE_MPI)
+if(NOT ADIOS2_HAVE_MPI)
   find_package(ADIOS1 COMPONENTS sequential REQUIRED)
 
   add_executable(TestBPWriteRead TestBPWriteRead.cpp)
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 62502eeab..2ca393877 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -5,6 +5,6 @@ if(BUILD_TESTING)
   add_subdirectory(GTest)
 endif()
 
-if(ADIOS_HAVE_Python)
+if(ADIOS2_HAVE_Python)
   add_subdirectory(pybind11)
 endif()
diff --git a/thirdparty/KWSys/CMakeLists.txt b/thirdparty/KWSys/CMakeLists.txt
index ef8e57769..6faf39f54 100644
--- a/thirdparty/KWSys/CMakeLists.txt
+++ b/thirdparty/KWSys/CMakeLists.txt
@@ -1,7 +1,7 @@
 set(KWSYS_NAMESPACE adios2sys)
 set(KWSYS_USE_DynamicLoader ON)
 set(KWSYS_BUILD_SHARED OFF)
-if(NOT ADIOS_BUILD_SHARED_LIBS)
+if(NOT ADIOS2_BUILD_SHARED_LIBS)
   set(KWSYS_INSTALL_EXPORT_NAME adios2)
   set(KWSYS_INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR})
 endif()
-- 
GitLab