Merge topic 'nasm-object-format-flags' f9a127c713 ASM_NASM: Allow flags to override default object format Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !12024
diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 4558c81..956232c 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake
@@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 4) set(CMake_VERSION_MINOR 3) -set(CMake_VERSION_PATCH 20260507) +set(CMake_VERSION_PATCH 20260508) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0)
diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in index 7cceaf2..67450e6 100644 --- a/Utilities/Sphinx/conf.py.in +++ b/Utilities/Sphinx/conf.py.in
@@ -100,6 +100,7 @@ r'about:', r'https://gitlab\.kitware\.com/cmake/community/-/wikis/doc/cpack', r'https://web\.archive\.org/', + r'https://en\.cppreference\.com/', r'https://www\.freedesktop\.org/', r'https://www\.gnu\.org/', r'https://www\.intel\.com/',