mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-25 10:18:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'GNUInstallDirs-conda-fix' into release-3.22

Browse Source 
7896991af0 GNUInstallDirs: Prefer system lib64 over conda lib when ambiguous

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6773
This commit is contained in:
Brad King
2021-12-01 14:34:13 +00:00
committed by Kitware Robot
parent bd7f276c52 7896991af0
commit cab4551889
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/GNUInstallDirs.cmake
View File

@@ -253,7 +253,9 @@ if(NOT DEFINED CMAKE_INSTALL_LIBDIR OR (_libdir_set
elseif(DEFINED ENV{CONDA_PREFIX})
set(conda_prefix "$ENV{CONDA_PREFIX}")
cmake_path(ABSOLUTE_PATH conda_prefix NORMALIZE)
if("${CMAKE_INSTALL_PREFIX}" STREQUAL conda_prefix)
if("${CMAKE_INSTALL_PREFIX}" STREQUAL conda_prefix AND
NOT ("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$" OR
"${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/local/?$"))
set(__system_type_for_install "conda")
endif()
endif()