[Cmake-commits] CMake branch, master, updated. v3.12.2-799-gb2e7970
Kitware Robot
kwrobot at kitware.com
Wed Oct 3 08:15:05 EDT 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, master has been updated
via b2e797032988a7ca6e805185d9b79b07e207d3cd (commit)
via cf9f3852ddd9330a18e6f9b46e40a914cd909156 (commit)
via 868ced8619e7a30c79346c38f8ba313686e66844 (commit)
via 0da3340b9c337bc64f7c823403c8251ee20aaa9e (commit)
via b6a689c6f87bd88b9792e35e7537bde131580eb9 (commit)
via 7787fb6e3e03806c861eadf930a1dace2ee248dd (commit)
via 63c9356544ccd1471e3c428f21662420c0ceb00b (commit)
via 518c5060a73e01bae486ff386913aed1588a312d (commit)
from 9fc3024f62304a65c2fb1eaf5303e417530c650d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b2e797032988a7ca6e805185d9b79b07e207d3cd
commit b2e797032988a7ca6e805185d9b79b07e207d3cd
Merge: cf9f385 7787fb6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 3 08:10:38 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 3 08:10:38 2018 -0400
Merge branch 'release-3.12'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf9f3852ddd9330a18e6f9b46e40a914cd909156
commit cf9f3852ddd9330a18e6f9b46e40a914cd909156
Merge: 868ced8 63c9356
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 3 12:06:02 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Oct 3 08:06:08 2018 -0400
Merge topic 'bug-fixes'
63c9356544 FindPython*: fix erroneous handling of virtual environments
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2430
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=868ced8619e7a30c79346c38f8ba313686e66844
commit 868ced8619e7a30c79346c38f8ba313686e66844
Merge: 9fc3024 0da3340
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 3 12:05:28 2018 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Wed Oct 3 08:05:32 2018 -0400
Merge topic 'update-kwsys'
0da3340b9c Merge branch 'upstream-KWSys' into update-kwsys
b6a689c6f8 KWSys 2018-10-03 (9d6873b1)
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !2437
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0da3340b9c337bc64f7c823403c8251ee20aaa9e
commit 0da3340b9c337bc64f7c823403c8251ee20aaa9e
Merge: 84457a0 b6a689c
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 3 07:36:04 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 3 07:36:04 2018 -0400
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2018-10-03 (9d6873b1)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6a689c6f87bd88b9792e35e7537bde131580eb9
commit b6a689c6f87bd88b9792e35e7537bde131580eb9
Author: KWSys Upstream <kwrobot at kitware.com>
AuthorDate: Wed Oct 3 07:34:07 2018 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Oct 3 07:36:03 2018 -0400
KWSys 2018-10-03 (9d6873b1)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 9d6873b11837f341027c9a6f2880708126f08b8b (master).
Upstream Shortlog
-----------------
E5ten (1):
f17f22a2 Terminal: Add alacritty and alacritty-direct to VT100 color support whitelist
diff --git a/Terminal.c b/Terminal.c
index 1bcfd0c..4dd2461 100644
--- a/Terminal.c
+++ b/Terminal.c
@@ -103,6 +103,8 @@ static int kwsysTerminalStreamIsNotInteractive(FILE* stream)
/* List of terminal names known to support VT100 color escape sequences. */
static const char* kwsysTerminalVT100Names[] = { "Eterm",
+ "alacritty",
+ "alacritty-direct",
"ansi",
"color-xterm",
"con132x25",
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63c9356544ccd1471e3c428f21662420c0ceb00b
commit 63c9356544ccd1471e3c428f21662420c0ceb00b
Author: Marc Chevrier <marc.chevrier at gmail.com>
AuthorDate: Tue Oct 2 11:09:45 2018 +0200
Commit: Marc Chevrier <marc.chevrier at gmail.com>
CommitDate: Tue Oct 2 11:09:45 2018 +0200
FindPython*: fix erroneous handling of virtual environments
fixes: #18408
diff --git a/Modules/FindPython.cmake b/Modules/FindPython.cmake
index 0bf0b4f..8645a0d 100644
--- a/Modules/FindPython.cmake
+++ b/Modules/FindPython.cmake
@@ -135,6 +135,12 @@ Hints
Value ``ONLY`` is not supported so ``FIRST`` will be used instead.
+.. note::
+
+ If a Python virtual environment is configured, set variable
+ ``Python_FIND_REGISTRY`` (Windows) or ``CMAKE_FIND_FRAMEWORK`` (macOS) with
+ value ``LAST`` or ``NEVER`` to select it preferably.
+
Commands
^^^^^^^^
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index 1834591..a8a73a7 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -355,20 +355,23 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
${_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES}
NAMES_PER_DIR
HINTS ${_${_PYTHON_PREFIX}_HINTS}
- PATH_SUFFIXES bin
+ PATH_SUFFIXES bin ${_${_PYTHON_PREFIX}_IRON_PYTHON_PATH_SUFFIXES}
NO_SYSTEM_ENVIRONMENT_PATH
NO_CMAKE_SYSTEM_PATH)
# try using standard paths.
- # NAMES_PER_DIR is not defined on purpose to have a chance to find
- # expected version.
- # For example, typical systems have 'python' for version 2.* and 'python3'
- # for version 3.*. So looking for names per dir will find, potentially,
- # systematically 'python' (i.e. version 2) even if version 3 is searched.
- find_program (${_PYTHON_PREFIX}_EXECUTABLE
- NAMES python${_${_PYTHON_PREFIX}_VERSION}
- python${_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR}
- python
- ${_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES})
+ if (WIN32)
+ find_program (${_PYTHON_PREFIX}_EXECUTABLE
+ NAMES python${_${_PYTHON_PREFIX}_VERSION}
+ python${_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR}
+ python
+ ${_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES}
+ NAMES_PER_DIR)
+ else()
+ find_program (${_PYTHON_PREFIX}_EXECUTABLE
+ NAMES python${_${_PYTHON_PREFIX}_VERSION}
+ python${_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR}
+ NAMES_PER_DIR)
+ endif()
# Apple frameworks handling
if (APPLE AND _${_PYTHON_PREFIX}_FIND_FRAMEWORK STREQUAL "LAST")
@@ -413,6 +416,7 @@ if ("Interpreter" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS)
NAMES python${_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR}
python
${_${_PYTHON_PREFIX}_IRON_PYTHON_NAMES}
+ NAMES_PER_DIR
HINTS ${_${_PYTHON_PREFIX}_HINTS}
PATH_SUFFIXES bin ${_${_PYTHON_PREFIX}_IRON_PYTHON_PATH_SUFFIXES}
NO_SYSTEM_ENVIRONMENT_PATH
diff --git a/Modules/FindPython2.cmake b/Modules/FindPython2.cmake
index 2735a25..998e992 100644
--- a/Modules/FindPython2.cmake
+++ b/Modules/FindPython2.cmake
@@ -136,6 +136,12 @@ Hints
Value ``ONLY`` is not supported so ``FIRST`` will be used instead.
+.. note::
+
+ If a Python virtual environment is configured, set variable
+ ``Python_FIND_REGISTRY`` (Windows) or ``CMAKE_FIND_FRAMEWORK`` (macOS) with
+ value ``LAST`` or ``NEVER`` to select it preferably.
+
Commands
^^^^^^^^
diff --git a/Modules/FindPython3.cmake b/Modules/FindPython3.cmake
index ed7e1a3..2176f3f 100644
--- a/Modules/FindPython3.cmake
+++ b/Modules/FindPython3.cmake
@@ -136,6 +136,12 @@ Hints
Value ``ONLY`` is not supported so ``FIRST`` will be used instead.
+.. note::
+
+ If a Python virtual environment is configured, set variable
+ ``Python_FIND_REGISTRY`` (Windows) or ``CMAKE_FIND_FRAMEWORK`` (macOS) with
+ value ``LAST`` or ``NEVER`` to select it preferably.
+
Commands
^^^^^^^^
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPython.cmake | 6 ++++++
Modules/FindPython/Support.cmake | 26 +++++++++++++++-----------
Modules/FindPython2.cmake | 6 ++++++
Modules/FindPython3.cmake | 6 ++++++
Source/kwsys/Terminal.c | 2 ++
5 files changed, 35 insertions(+), 11 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list