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 /Modules/Platform | |
| 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 'Modules/Platform')
| -rw-r--r-- | Modules/Platform/UnixPaths.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake index 7fe64cb..b9381c3 100644 --- a/Modules/Platform/UnixPaths.cmake +++ b/Modules/Platform/UnixPaths.cmake @@ -95,6 +95,10 @@ unset(_cmake_sysroot_compile) # synchronized if(CMAKE_COMPILER_SYSROOT) list(PREPEND CMAKE_SYSTEM_PREFIX_PATH "${CMAKE_COMPILER_SYSROOT}") + + if(DEFINED ENV{CONDA_PREFIX} AND EXISTS "$ENV{CONDA_PREFIX}") + list(APPEND CMAKE_SYSTEM_PREFIX_PATH "$ENV{CONDA_PREFIX}") + endif() endif() # Enable use of lib32 and lib64 search path variants by default. |