diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-22 12:12:16 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-22 12:12:24 (GMT) |
| commit | a7b3102e00c8849f27c626ffa62a95b1cc19a95b (patch) | |
| tree | bc764a9c53b22dd327ecb96d419b15797606e569 /Help | |
| parent | fa6db3738a61d341132aa091becd39ddf75a2bec (diff) | |
| parent | 50879ce4124508546674c7d2e681fe49840a9c73 (diff) | |
| download | CMake-a7b3102e00c8849f27c626ffa62a95b1cc19a95b.zip CMake-a7b3102e00c8849f27c626ffa62a95b1cc19a95b.tar.gz CMake-a7b3102e00c8849f27c626ffa62a95b1cc19a95b.tar.bz2 | |
Merge topic 'support_conda_env'
50879ce412 Conda: Add CONDA_PREFIX as an acceptable system prefix path
cd9c3c000f Tests: Update QtAutogen codeeditor test only include headers needed
d806bd2e8c Tests: Update test suite to run in an Anaconda environment
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4773
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst b/Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst index e0ee979..81a7a0b 100644 --- a/Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst +++ b/Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst @@ -34,6 +34,9 @@ Darwin: OpenBSD: * ``ENV{LOCALBASE}`` +Unix: + * ``ENV{CONDA_PREFIX}`` when using a conda compiler + Windows: * ``ENV{ProgramW6432}`` * ``ENV{ProgramFiles}`` |