[llvm] cmake: Allow CLANG_RESOURCE_DIR to be absolute. (PR #145996)
Peter Collingbourne via llvm-commits
llvm-commits at lists.llvm.org
Fri Jun 27 15:10:09 PDT 2025
https://github.com/pcc updated https://github.com/llvm/llvm-project/pull/145996
>From 8dc737ab3523da447a40c6e0ada411acea49af73 Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <pcc at google.com>
Date: Thu, 26 Jun 2025 16:58:56 -0700
Subject: [PATCH 1/2] =?UTF-8?q?[=F0=9D=98=80=F0=9D=97=BD=F0=9D=97=BF]=20in?=
=?UTF-8?q?itial=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Created using spr 1.3.6-beta.1
---
cmake/Modules/GetClangResourceDir.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/Modules/GetClangResourceDir.cmake b/cmake/Modules/GetClangResourceDir.cmake
index def5bd60424e7..9fd585729b0f0 100644
--- a/cmake/Modules/GetClangResourceDir.cmake
+++ b/cmake/Modules/GetClangResourceDir.cmake
@@ -10,7 +10,7 @@ function(get_clang_resource_dir out_var)
cmake_parse_arguments(ARG "" "PREFIX;SUBDIR" "" ${ARGN})
if(DEFINED CLANG_RESOURCE_DIR AND NOT CLANG_RESOURCE_DIR STREQUAL "")
- set(ret_dir bin/${CLANG_RESOURCE_DIR})
+ cmake_path(APPEND bin ${CLANG_RESOURCE_DIR} OUTPUT_VARIABLE ret_dir)
else()
if (NOT CLANG_VERSION_MAJOR)
string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${PACKAGE_VERSION})
>From 6fd81c04d4639789a1aa24e2d5e97751fd02d413 Mon Sep 17 00:00:00 2001
From: Peter Collingbourne <pcc at google.com>
Date: Fri, 27 Jun 2025 15:09:55 -0700
Subject: [PATCH 2/2] Address review comment
Created using spr 1.3.6-beta.1
---
cmake/Modules/GetClangResourceDir.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/cmake/Modules/GetClangResourceDir.cmake b/cmake/Modules/GetClangResourceDir.cmake
index 9fd585729b0f0..518220188f96d 100644
--- a/cmake/Modules/GetClangResourceDir.cmake
+++ b/cmake/Modules/GetClangResourceDir.cmake
@@ -10,7 +10,8 @@ function(get_clang_resource_dir out_var)
cmake_parse_arguments(ARG "" "PREFIX;SUBDIR" "" ${ARGN})
if(DEFINED CLANG_RESOURCE_DIR AND NOT CLANG_RESOURCE_DIR STREQUAL "")
- cmake_path(APPEND bin ${CLANG_RESOURCE_DIR} OUTPUT_VARIABLE ret_dir)
+ set(ret_dir bin)
+ cmake_path(APPEND ret_dir ${CLANG_RESOURCE_DIR})
else()
if (NOT CLANG_VERSION_MAJOR)
string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${PACKAGE_VERSION})
More information about the llvm-commits
mailing list