diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22a66a8b50..3fbd711486 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,6 +195,15 @@ add_subdirectory(source)
 #------------------------------------------------------------------------------#
 add_subdirectory(bindings)
 
+#------------------------------------------------------------------------------#
+# Examples
+#------------------------------------------------------------------------------#
+option(ADIOS2_BUILD_EXAMPLES "Build examples" ON)
+option(ADIOS2_BUILD_EXAMPLES_EXPERIMENTAL "Build experimental examples" OFF)
+if(ADIOS2_BUILD_EXAMPLES)
+  add_subdirectory(examples)
+endif()
+
 #------------------------------------------------------------------------------#
 # Testing
 #------------------------------------------------------------------------------#
@@ -219,15 +228,6 @@ if(BUILD_TESTING)
   add_subdirectory(testing)
 endif()
 
-#------------------------------------------------------------------------------#
-# Examples
-#------------------------------------------------------------------------------#
-option(ADIOS2_BUILD_EXAMPLES "Build examples" ON)
-option(ADIOS2_BUILD_EXAMPLES_EXPERIMENTAL "Build experimental examples" OFF)
-if(ADIOS2_BUILD_EXAMPLES)
-  add_subdirectory(examples)
-endif()
-
 #------------------------------------------------------------------------------#
 # Generating package configs
 #------------------------------------------------------------------------------#
@@ -280,6 +280,7 @@ endif()
 message("    Library Type: ${msg_lib_type}")
 message("    Build Type:   ${CMAKE_BUILD_TYPE}")
 message("    Testing: ${BUILD_TESTING}")
+message("    Examples: ${ADIOS2_BUILD_EXAMPLES}")
 message("    Build Options:")
 
 foreach(opt IN LISTS ADIOS2_CONFIG_OPTS)
@@ -295,4 +296,3 @@ message("    RDMA Transport for Staging: Available")
 else()
 message("    RDMA Transport for Staging: Unconfigured")
 endif()
-message("")
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 2ac65113d3..77f5a38449 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -9,9 +9,7 @@ add_subdirectory(query)
 add_subdirectory(useCases)
 
 if(ADIOS2_HAVE_MPI)
-  #if(MPIEXEC_MAX_NUMPROCS GREATER 3)
-    add_subdirectory(heatTransfer)
-  #endif()
+  add_subdirectory(heatTransfer)
 endif()
 
 if(ADIOS2_BUILD_EXAMPLES_EXPERIMENTAL)