diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2019-04-01 11:19:54 +0200 |
|---|---|---|
| committer | Marc Chevrier <marc.chevrier@gmail.com> | 2019-04-03 09:16:17 +0200 |
| commit | 8a2f62cc18ece0ebfed0ff6abf53d419d43d2fa1 (patch) | |
| tree | 465c79b4ce0f366fe40a00e1be9e965f3c04af4d /Modules/FindPython3.cmake | |
| parent | 5ad73b608d4fc7cc6b30017159b800802a503b0c (diff) | |
| download | cmake-8a2f62cc18ece0ebfed0ff6abf53d419d43d2fa1.tar.gz | |
FindPython*: Add capability to control virtual env handling.
Fixes: #19097
Diffstat (limited to 'Modules/FindPython3.cmake')
| -rw-r--r-- | Modules/FindPython3.cmake | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/Modules/FindPython3.cmake b/Modules/FindPython3.cmake index c2f3384697..3409554580 100644 --- a/Modules/FindPython3.cmake +++ b/Modules/FindPython3.cmake @@ -137,7 +137,7 @@ Hints ``Python3_FIND_REGISTRY`` On Windows the ``Python3_FIND_REGISTRY`` variable determine the order of preference between registry and environment variables. - the ``Python3_FIND_REGISTRY`` variable can be set to empty or one of the + The ``Python3_FIND_REGISTRY`` variable can be set to empty or one of the following: * ``FIRST``: Try to use registry before environment variables. @@ -146,18 +146,30 @@ Hints * ``NEVER``: Never try to use registry. ``CMAKE_FIND_FRAMEWORK`` - On OS X the :variable:`CMAKE_FIND_FRAMEWORK` variable determine the order of + On macOS the :variable:`CMAKE_FIND_FRAMEWORK` variable determine the order of preference between Apple-style and unix-style package components. .. note:: Value ``ONLY`` is not supported so ``FIRST`` will be used instead. -.. note:: +``Python3_FIND_VIRTUALENV`` + This variable defines the handling of virtual environments. It is meaningfull + only when a virtual environment is active (i.e. the ``activate`` script has + been evaluated). In this case, it takes precedence over + ``Python3_FIND_REGISTRY`` and ``CMAKE_FIND_FRAMEWORK`` variables. + The ``Python3_FIND_VIRTUALENV`` variable can be set to empty or one of the + following: - 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. + * ``FIRST``: The virtual environment is used before any other standard + paths to look-up for the interpreter. This is the default. + * ``ONLY``: Only the virtual environment is used to look-up for the + interpreter. + * ``STANDARD``: The virtual environment is not used to look-up for the + interpreter. In this case, variable ``Python3_FIND_REGISTRY`` (Windows) + or ``CMAKE_FIND_FRAMEWORK`` (macOS) can be set with value ``LAST`` or + ``NEVER`` to select preferably the interpreter from the virtual + environment. Commands ^^^^^^^^ |