From 3371d5208cfa6c6edeb9195cfc9b25372c8b90d3 Mon Sep 17 00:00:00 2001
From: mic84 <mrosso@lbl.gov>
Date: Wed, 30 Sep 2020 22:57:59 -0700
Subject: [PATCH] CMake: fix ENABLE_PROFPARSER and ENABLE_SENSEI options
 (#1428)

* CMake: fix incorrect option

* CMake: fix ENABLE_SENSEI option
---
 Docs/sphinx_documentation/source/BuildingAMReX.rst | 4 ++--
 Src/CMakeLists.txt                                 | 2 +-
 Src/Extern/amrdata/CMakeLists.txt                  | 2 +-
 Tools/CMake/AMReXConfig.cmake.in                   | 4 ++--
 Tools/CMake/AMReXThirdPartyLibraries.cmake         | 2 +-
 Tools/CMake/AMReX_Defines.cmake                    | 2 +-
 Tools/CMake/AMReX_Options.cmake                    | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Docs/sphinx_documentation/source/BuildingAMReX.rst b/Docs/sphinx_documentation/source/BuildingAMReX.rst
index ced71f83bd0..1c859dc84d4 100644
--- a/Docs/sphinx_documentation/source/BuildingAMReX.rst
+++ b/Docs/sphinx_documentation/source/BuildingAMReX.rst
@@ -461,7 +461,7 @@ The list of available options is reported in the :ref:`table <tab:cmakevar>` bel
    +------------------------------+-------------------------------------------------+-------------+-----------------+
    | ENABLE_SUNDIALS              |  Enable SUNDIALS 4 interfaces                   | NO          | YES, NO         |
    +------------------------------+-------------------------------------------------+-------------+-----------------+
-   | ENABLE_SENSEI_IN_SITU        |  Enable SENSEI_IN_SITU infrastucture            | NO          | YES, NO         |
+   | ENABLE_SENSEI                |  Enable SENSEI_IN_SITU infrastucture            | NO          | YES, NO         |
    +------------------------------+-------------------------------------------------+-------------+-----------------+
    | ENABLE_CONDUIT               |  Enable Conduit support                         | NO          | YES, NO         |
    +------------------------------+-------------------------------------------------+-------------+-----------------+
@@ -666,7 +666,7 @@ A list of AMReX component names and related configure options are shown in the t
    +------------------------------+-----------------+
    | ENABLE_SUNDIALS              | SUNDIALS        |
    +------------------------------+-----------------+
-   | ENABLE_SENSEI_IN_SITU        | SENSEI          |
+   | ENABLE_SENSEI                | SENSEI          |
    +------------------------------+-----------------+
    | ENABLE_CONDUIT               | CONDUIT         |
    +------------------------------+-----------------+
diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt
index 133ce51fe6c..6a3aadcb158 100644
--- a/Src/CMakeLists.txt
+++ b/Src/CMakeLists.txt
@@ -136,7 +136,7 @@ if (ENABLE_PROFPARSER)
     add_subdirectory(Extern/ProfParser)
 endif ()
 
-if (ENABLE_SENSEI_INSITU)
+if (ENABLE_SENSEI)
    add_subdirectory(Extern/SENSEI)
 endif ()
 
diff --git a/Src/Extern/amrdata/CMakeLists.txt b/Src/Extern/amrdata/CMakeLists.txt
index 9c575f651a7..7317f786b07 100644
--- a/Src/Extern/amrdata/CMakeLists.txt
+++ b/Src/Extern/amrdata/CMakeLists.txt
@@ -12,6 +12,6 @@ target_sources(amrex
    AMReX_FABUTIL_${DIM}D.F
    )
 
-if (ENABLE_PROPARSER)
+if (ENABLE_PROFPARSER)
    target_sources( amrex PRIVATE AMReX_XYPlotDataList.cpp AMReX_XYPlotDataList.H )
 endif ()
diff --git a/Tools/CMake/AMReXConfig.cmake.in b/Tools/CMake/AMReXConfig.cmake.in
index 5bfe98c9a2e..4477dfd6a2c 100644
--- a/Tools/CMake/AMReXConfig.cmake.in
+++ b/Tools/CMake/AMReXConfig.cmake.in
@@ -54,7 +54,7 @@ set(AMReX_LSOLVERS_FOUND            @ENABLE_LINEAR_SOLVERS@)
 set(AMReX_AMRDATA_FOUND             @ENABLE_AMRDATA@)
 set(AMReX_PARTICLES_FOUND           @ENABLE_PARTICLES@)
 set(AMReX_DPARTICLES_FOUND          @ENABLE_DP_PARTICLES@)
-set(AMReX_SENSEI_FOUND              @ENABLE_SENSEI_INSITU@)
+set(AMReX_SENSEI_FOUND              @ENABLE_SENSEI@)
 set(AMReX_CONDUIT_FOUND             @ENABLE_CONDUIT@)
 set(AMReX_SUNDIALS_FOUND            @ENABLE_SUNDIALS@)
 set(AMReX_ASCENT_FOUND              @ENABLE_ASCENT@)
@@ -100,7 +100,7 @@ endif ()
 #
 # Third party libraries
 #
-if (@ENABLE_SENSEI_INSITU@)
+if (@ENABLE_SENSEI@)
    find_dependency(SENSEI REQUIRED)
 endif ()
 
diff --git a/Tools/CMake/AMReXThirdPartyLibraries.cmake b/Tools/CMake/AMReXThirdPartyLibraries.cmake
index 8adbb78da84..52ad1ff27ce 100644
--- a/Tools/CMake/AMReXThirdPartyLibraries.cmake
+++ b/Tools/CMake/AMReXThirdPartyLibraries.cmake
@@ -16,7 +16,7 @@ endif ()
 #
 # Sensei
 #
-if (ENABLE_SENSEI_INSITU)
+if (ENABLE_SENSEI)
     find_package(SENSEI REQUIRED)
     target_link_libraries( amrex PUBLIC sensei )
 endif ()
diff --git a/Tools/CMake/AMReX_Defines.cmake b/Tools/CMake/AMReX_Defines.cmake
index ac22dd8126d..ea1cf784530 100644
--- a/Tools/CMake/AMReX_Defines.cmake
+++ b/Tools/CMake/AMReX_Defines.cmake
@@ -125,7 +125,7 @@ function ( set_amrex_defines )
    endif ()
 
    # SENSEI Insitu -- only legacy
-   add_amrex_define( BL_USE_SENSEI_INSITU IF ENABLE_SENSEI_INSITU )
+   add_amrex_define( BL_USE_SENSEI_INSITU IF ENABLE_SENSEI )
 
    # Conduit Support
    add_amrex_define( AMREX_USE_CONDUIT NO_LEGACY IF ENABLE_CONDUIT )
diff --git a/Tools/CMake/AMReX_Options.cmake b/Tools/CMake/AMReX_Options.cmake
index af70d97a91c..fb25ea145e6 100644
--- a/Tools/CMake/AMReX_Options.cmake
+++ b/Tools/CMake/AMReX_Options.cmake
@@ -171,8 +171,8 @@ print_option( ENABLE_DP_PARTICLES )
 #
 
 # sensei
-option( ENABLE_SENSEI_INSITU "Enable SENSEI in situ infrastructure" OFF )
-print_option( ENABLE_SENSEI_INSITU )
+option( ENABLE_SENSEI "Enable SENSEI in situ infrastructure" OFF )
+print_option( ENABLE_SENSEI )
 
 # Conduit (requires CONDUIT_DIR)
 option( ENABLE_CONDUIT "Enable Conduit support" OFF )