diff options
| author | Robert Maynard <rmaynard@nvidia.com> | 2021-11-29 18:47:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-11-30 15:51:33 (GMT) |
| commit | 7896991af029d66c9e1692ce18027fafaa0e9bd8 (patch) | |
| tree | d6c3e2e6b54dfbce052a48ecdaf2cacff1d78be5 /Modules | |
| parent | ff8c3acc0fbe037931680fc74b1a2d3f0af58c79 (diff) | |
| download | CMake-7896991af029d66c9e1692ce18027fafaa0e9bd8.zip CMake-7896991af029d66c9e1692ce18027fafaa0e9bd8.tar.gz CMake-7896991af029d66c9e1692ce18027fafaa0e9bd8.tar.bz2 | |
GNUInstallDirs: Prefer system lib64 over conda lib when ambiguous
Update logic added by commit ecaca8c129 (GNUInstallDirs now aware of
conda lib directory requirements, 2021-09-08, v3.22.0-rc1~142^2).
When it is ambiguous if we are doing a conda install or a system
install prefer using the system library directory.
Fixes: #22962
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/GNUInstallDirs.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake index 6ca424a..01bd637 100644 --- a/Modules/GNUInstallDirs.cmake +++ b/Modules/GNUInstallDirs.cmake @@ -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() |