diff options
| author | Sebastian Müller <gsenpo@gmail.com> | 2019-12-20 13:24:54 +0100 |
|---|---|---|
| committer | Sebastian Müller <gsenpo@gmail.com> | 2019-12-21 15:38:00 +0100 |
| commit | 776d27d4a4eb27f5618e682dafc1d44fba8598c6 (patch) | |
| tree | 671560defc90f6bec639982692c36dbe5cbebca7 /Modules/FindPython.cmake | |
| parent | 9f75f9974f974611ab899675aa7bb987078e3b0d (diff) | |
| download | cmake-776d27d4a4eb27f5618e682dafc1d44fba8598c6.tar.gz | |
FindPython: Extend virtual environment handling by considering conda
- Add functionality to recognize and use CONDA_PREFIX environment variable
- Add tests for conda virtual environments
- Fixes: #20111
Diffstat (limited to 'Modules/FindPython.cmake')
| -rw-r--r-- | Modules/FindPython.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/FindPython.cmake b/Modules/FindPython.cmake index 2bdfaf393d..177ed58485 100644 --- a/Modules/FindPython.cmake +++ b/Modules/FindPython.cmake @@ -220,12 +220,12 @@ Hints variable will be used, if any. ``Python_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 - ``Python_FIND_REGISTRY`` and ``CMAKE_FIND_FRAMEWORK`` variables. - The ``Python_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 ``Python_FIND_REGISTRY`` and ``CMAKE_FIND_FRAMEWORK`` + variables. The ``Python_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. |