Merge pull request #736 from glotzerlab/fix-rtd-builds

Detect conda environments more reliably
glotzerlab · Mar 29, 2021 · b70318c · b70318c
2 parents 8151715 + 860fde7
commit b70318c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/freud/CMakeLists.txt b/freud/CMakeLists.txt
@@ -35,8 +35,8 @@ endif()
 # Detect when building against a conda environment set the _using_conda variable
 # for use both in this file and in the parent
 get_filename_component(_python_bin_dir ${PYTHON_EXECUTABLE} DIRECTORY)
-if(EXISTS "${_python_bin_dir}/conda" OR DEFINED ENV{CONDA_EXE})
-  message("-- Detected conda python, setting INSTALL_RPATH_USE_LINK_PATH")
+if(EXISTS "${_python_bin_dir}/../conda-meta")
+  message("-- Detected conda environment, setting INSTALL_RPATH_USE_LINK_PATH")
   set(_using_conda On)
   set(_using_conda
       On