35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
From 7896991af029d66c9e1692ce18027fafaa0e9bd8 Mon Sep 17 00:00:00 2001
|
|
From: Robert Maynard <rmaynard@nvidia.com>
|
|
Date: Mon, 29 Nov 2021 13:47:16 -0500
|
|
Subject: [PATCH] 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
|
|
---
|
|
Modules/GNUInstallDirs.cmake | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake
|
|
index 6ca424ad5d..01bd63716c 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()
|
|
--
|
|
GitLab
|
|
|