diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2019-12-23 11:33:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-12-23 11:33:54 (GMT) |
| commit | 417c533010e067ea78634e6ba50a1d2568949ad2 (patch) | |
| tree | 3a25de9f6e832cec0b1de2a76c94802b62e4f0f4 /Modules/FindPython2.cmake | |
| parent | 20e0d3c33d5b6596e5b1e99b2a54bafcfaedafdc (diff) | |
| parent | 776d27d4a4eb27f5618e682dafc1d44fba8598c6 (diff) | |
| download | CMake-417c533010e067ea78634e6ba50a1d2568949ad2.zip CMake-417c533010e067ea78634e6ba50a1d2568949ad2.tar.gz CMake-417c533010e067ea78634e6ba50a1d2568949ad2.tar.bz2 | |
Merge topic 'findpython_conda_support'
776d27d4a4 FindPython: Extend virtual environment handling by considering conda
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4155
Diffstat (limited to 'Modules/FindPython2.cmake')
| -rw-r--r-- | Modules/FindPython2.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/FindPython2.cmake b/Modules/FindPython2.cmake index 3cc7d56..9d4eda2 100644 --- a/Modules/FindPython2.cmake +++ b/Modules/FindPython2.cmake @@ -176,12 +176,12 @@ Hints variable will be used, if any. ``Python2_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 - ``Python2_FIND_REGISTRY`` and ``CMAKE_FIND_FRAMEWORK`` variables. - The ``Python2_FIND_VIRTUALENV`` variable can be set to empty or one of the - following: + This variable defines the handling of virtual environments managed by + ``virtualenv`` or ``conda``. It is meaningful only when a virtual environment + is active (i.e. the ``activate`` script has been evaluated). In this case, it + takes precedence over ``Python2_FIND_REGISTRY`` and ``CMAKE_FIND_FRAMEWORK`` + variables. The ``Python2_FIND_VIRTUALENV`` variable can be set to empty or + one of the following: * ``FIRST``: The virtual environment is used before any other standard paths to look-up for the interpreter. This is the default. |