6 files changed, 32 insertions, 14 deletions
diff --git a/Modules/Compiler/IntelLLVM-C.cmake b/Modules/Compiler/IntelLLVM-C.cmake
index d7346f6..3a81154 100644
--- a/Modules/Compiler/IntelLLVM-C.cmake
+++ b/Modules/Compiler/IntelLLVM-C.cmake
@@ -41,6 +41,9 @@ if(NOT "x${CMAKE_C_SIMULATE_ID}" STREQUAL "xMSVC")
 
   set(CMAKE_C17_STANDARD_COMPILE_OPTION "-std=c17")
   set(CMAKE_C17_EXTENSION_COMPILE_OPTION "-std=gnu17")
+
+  set(CMAKE_C23_STANDARD_COMPILE_OPTION "-std=c2x")
+  set(CMAKE_C23_EXTENSION_COMPILE_OPTION "-std=gnu2x")
 else()
   # clang-cl doesn't have any of these
   set(CMAKE_C90_STANDARD_COMPILE_OPTION "")
@@ -54,6 +57,9 @@ else()
 
   set(CMAKE_C17_STANDARD_COMPILE_OPTION "")
   set(CMAKE_C17_EXTENSION_COMPILE_OPTION "")
+
+  set(CMAKE_C23_STANDARD_COMPILE_OPTION "")
+  set(CMAKE_C23_EXTENSION_COMPILE_OPTION "")
 endif()
 
 __compiler_check_default_language_standard(C 2020 17)
diff --git a/Modules/Compiler/IntelLLVM-CXX.cmake b/Modules/Compiler/IntelLLVM-CXX.cmake
index 4d3f5a1..45b723f 100644
--- a/Modules/Compiler/IntelLLVM-CXX.cmake
+++ b/Modules/Compiler/IntelLLVM-CXX.cmake
@@ -46,6 +46,9 @@ if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
 
   set(CMAKE_CXX20_STANDARD_COMPILE_OPTION  "-std=c++20")
   set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-std=gnu++20")
+
+  set(CMAKE_CXX23_STANDARD_COMPILE_OPTION  "-std=c++2b")
+  set(CMAKE_CXX23_EXTENSION_COMPILE_OPTION "-std=gnu++2b")
 else()
   set(CMAKE_CXX98_STANDARD_COMPILE_OPTION  "")
   set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "")
@@ -53,14 +56,17 @@ else()
   set(CMAKE_CXX11_STANDARD_COMPILE_OPTION  "")
   set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "")
 
-  set(CMAKE_CXX14_STANDARD_COMPILE_OPTION  "-Qstd=c++14")
-  set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-Qstd=c++14")
+  set(CMAKE_CXX14_STANDARD_COMPILE_OPTION  "-Qstd:c++14")
+  set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-Qstd:c++14")
+
+  set(CMAKE_CXX17_STANDARD_COMPILE_OPTION  "-Qstd:c++17")
+  set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-Qstd:c++17")
 
-  set(CMAKE_CXX17_STANDARD_COMPILE_OPTION  "-Qstd=c++17")
-  set(CMAKE_CXX17_EXTENSION_COMPILE_OPTION "-Qstd=c++17")
+  set(CMAKE_CXX20_STANDARD_COMPILE_OPTION  "-Qstd:c++20")
+  set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-Qstd:c++20")
 
-  set(CMAKE_CXX20_STANDARD_COMPILE_OPTION  "-Qstd=c++20")
-  set(CMAKE_CXX20_EXTENSION_COMPILE_OPTION "-Qstd=c++20")
+  set(CMAKE_CXX23_STANDARD_COMPILE_OPTION  "-Qstd:c++2b")
+  set(CMAKE_CXX23_EXTENSION_COMPILE_OPTION "-Qstd:c++2b")
 endif()
 
 __compiler_check_default_language_standard(CXX 2020 14)
diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
index 19eba95..3159ff7 100644
--- a/Modules/FindwxWidgets.cmake
+++ b/Modules/FindwxWidgets.cmake
@@ -615,7 +615,7 @@ if(wxWidgets_FIND_STYLE STREQUAL "win32")
           set(wxWidgets_INCLUDE_DIRS
             ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION})
         else()
-          DBG_MSG("wxWidgets_FOUND FALSE because ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h does not exists.")
+          DBG_MSG("wxWidgets_FOUND FALSE because ${WX_LIB_DIR}/${wxWidgets_CONFIGURATION}/wx/setup.h does not exist.")
           set(wxWidgets_FOUND FALSE)
         endif()
 
diff --git a/Modules/Internal/CPack/CPackRPM.cmake b/Modules/Internal/CPack/CPackRPM.cmake
index 7c10280..8ac1f6b 100644
--- a/Modules/Internal/CPack/CPackRPM.cmake
+++ b/Modules/Internal/CPack/CPackRPM.cmake
@@ -1200,7 +1200,7 @@ function(cpack_rpm_generate_package)
           file(READ ${CPACK_RPM_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_READ_FILE}
             "CPACK_RPM_SPEC_${RPM_SCRIPT_FILE_TIME_}${RPM_SCRIPT_FILE_TYPE_}")
         else()
-          message("CPackRPM:Warning: CPACK_RPM_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_SCRIPT_FILE <${CPACK_RPM_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_READ_FILE}> does not exists - ignoring")
+          message("CPackRPM:Warning: CPACK_RPM_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_SCRIPT_FILE <${CPACK_RPM_${RPM_SCRIPT_FILE_TIME_}_${RPM_SCRIPT_FILE_TYPE_}_READ_FILE}> does not exist - ignoring")
         endif()
       else()
         # reset SPEC var value if no file has been specified
@@ -1217,7 +1217,7 @@ function(cpack_rpm_generate_package)
     if(EXISTS ${CPACK_RPM_CHANGELOG_FILE})
       file(READ ${CPACK_RPM_CHANGELOG_FILE} CPACK_RPM_SPEC_CHANGELOG)
     else()
-      message(SEND_ERROR "CPackRPM:Warning: CPACK_RPM_CHANGELOG_FILE <${CPACK_RPM_CHANGELOG_FILE}> does not exists - ignoring")
+      message(SEND_ERROR "CPackRPM:Warning: CPACK_RPM_CHANGELOG_FILE <${CPACK_RPM_CHANGELOG_FILE}> does not exist - ignoring")
     endif()
   else()
     set(CPACK_RPM_SPEC_CHANGELOG "* Sun Jul 4 2010 Eric Noulard <eric.noulard@gmail.com> - ${CPACK_RPM_PACKAGE_VERSION}-${CPACK_RPM_PACKAGE_RELEASE}\n  Generated by CPack RPM (no Changelog file were provided)")
diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
index bda23ab..47e266d 100644
--- a/Modules/ProcessorCount.cmake
+++ b/Modules/ProcessorCount.cmake
@@ -22,9 +22,17 @@ This function is guaranteed to return a positive integer (>=1) if it
 succeeds.  It returns 0 if there's a problem determining the processor
 count.
 
+More generally accurate physical CPU count can be obtained via
+:command:`cmake_host_system_information`:
+
+.. code-block:: cmake
+
+  cmake_host_system_information(RESULT N
+                                QUERY NUMBER_OF_PHYSICAL_CORES)
+
 Example use, in a ctest -S dashboard script:
 
-::
+.. code-block:: cmake
 
    include(ProcessorCount)
    ProcessorCount(N)
@@ -33,8 +41,6 @@ Example use, in a ctest -S dashboard script:
      set(ctest_test_args ${ctest_test_args} PARALLEL_LEVEL ${N})
    endif()
 
-
-
 This function is intended to offer an approximation of the value of
 the number of compute cores available on the current machine, such
 that you may use that value for parallel building and parallel
diff --git a/Modules/SystemInformation.cmake b/Modules/SystemInformation.cmake
index 5ecc39a..fbc32a8 100644
--- a/Modules/SystemInformation.cmake
+++ b/Modules/SystemInformation.cmake
@@ -5,8 +5,8 @@
 cmake_minimum_required(VERSION ${CMAKE_VERSION})
 project(DumpInformation)
 
-# first get the standard information for th platform
-include_directories("This does not exists")
+# first get the standard information for the platform
+include_directories("This does not exist")
 get_directory_property(incl INCLUDE_DIRECTORIES)
 set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "${DumpInformation_BINARY_DIR};${DumpInformation_SOURCE_DIR}")