Fix variable change check

$CACHE{SC_ENABLE_MPI} does not give the previous setting.
cburstedde · Nov 11, 2024 · 07f473a · 07f473a
1 parent c371874
commit 07f473a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cmake/config.cmake b/cmake/config.cmake
@@ -98,11 +98,13 @@ set(SC_ENABLE_PTHREAD ${CMAKE_USE_PTHREADS_INIT})
 set(SC_ENABLE_MEMALIGN 1)
 
 # user has requested a different MPI setting, so we need to clear these cache variables to recheck
-if(NOT "${SC_ENABLE_MPI}" STREQUAL "$CACHE{SC_ENABLE_MPI}")
+if(NOT "${SC_ENABLE_MPI}" STREQUAL "${CACHED_SC_ENABLE_MPI}")
   unset(SC_ENABLE_MPICOMMSHARED CACHE)
   unset(SC_ENABLE_MPITHREAD CACHE)
   unset(SC_ENABLE_MPIWINSHARED CACHE)
   unset(SC_ENABLE_MPIIO CACHE)
+  # Update cached variable
+  set(CACHED_SC_ENABLE_MPI "${SC_ENABLE_MPI}" CACHE STRING "Cached value of SC_ENABLE_MPI")
 endif()
 
 if( SC_ENABLE_MPI )

diff --git a/cmake/options.cmake b/cmake/options.cmake
@@ -24,3 +24,6 @@ endif()
 if (DEFINED mpi)
   set_property(CACHE SC_ENABLE_MPI PROPERTY VALUE "${mpi}")
 endif()
+
+# Store the MPI setting for the case the user changes the value
+set(CACHED_SC_ENABLE_MPI "${SC_ENABLE_MPI}" CACHE STRING "Cached value of SC_ENABLE_MPI")