diff options
| -rw-r--r-- | Help/command/get_filename_component.rst | 4 | ||||
| -rw-r--r-- | Modules/FindPythonInterp.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindPythonLibs.cmake | 2 | ||||
| -rw-r--r-- | Utilities/Sphinx/conf.py.in | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Help/command/get_filename_component.rst b/Help/command/get_filename_component.rst index 368d3bb..ea2dedb 100644 --- a/Help/command/get_filename_component.rst +++ b/Help/command/get_filename_component.rst @@ -14,9 +14,9 @@ Sets ``<var>`` to a component of ``<FileName>``, where ``<mode>`` is one of: DIRECTORY = Directory without file name NAME = File name without directory EXT = File name longest extension (.b.c from d/a.b.c) - NAME_WE = File name without directory or longest extension + NAME_WE = File name with neither the directory nor the longest extension LAST_EXT = File name last extension (.c from d/a.b.c) - NAME_WLE = File name without directory or last extension + NAME_WLE = File name with neither the directory nor the last extension PATH = Legacy alias for DIRECTORY (use for CMake <= 2.8.11) Paths are returned with forward slashes and have no trailing slashes. diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake index 1e01a99..efe0f11 100644 --- a/Modules/FindPythonInterp.cmake +++ b/Modules/FindPythonInterp.cmake @@ -54,7 +54,7 @@ unset(_Python_NAMES) set(_PYTHON1_VERSIONS 1.6 1.5) set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) -set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) +set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) if(PythonInterp_FIND_VERSION) if(PythonInterp_FIND_VERSION_COUNT GREATER 1) diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake index d3ec7be..396f0d2 100644 --- a/Modules/FindPythonLibs.cmake +++ b/Modules/FindPythonLibs.cmake @@ -79,7 +79,7 @@ set(CMAKE_FIND_FRAMEWORK LAST) set(_PYTHON1_VERSIONS 1.6 1.5) set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) -set(_PYTHON3_VERSIONS 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) +set(_PYTHON3_VERSIONS 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0) if(PythonLibs_FIND_VERSION) if(PythonLibs_FIND_VERSION_COUNT GREATER 1) diff --git a/Utilities/Sphinx/conf.py.in b/Utilities/Sphinx/conf.py.in index e50c4f9..42b0951 100644 --- a/Utilities/Sphinx/conf.py.in +++ b/Utilities/Sphinx/conf.py.in @@ -17,6 +17,7 @@ version = '@conf_version@' # feature version release = '@conf_release@' # full version string pygments_style = 'colors.CMakeTemplateStyle' +language = 'en' primary_domain = 'cmake' highlight_language = 'none' |