diff options
| author | Tom Stellard <tstellar@redhat.com> | 2023-07-05 20:09:58 -0700 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2023-07-05 20:10:28 -0700 |
| commit | c951960e65961d19cfca9996bf8ab96155805256 (patch) | |
| tree | cb46ad750bdac4c2b126fa2f7fade0683219efca /cmake | |
| parent | cea3a8984162f8d5b3086563185ec0c68e09c118 (diff) | |
| download | llvm-c951960e65961d19cfca9996bf8ab96155805256.zip llvm-c951960e65961d19cfca9996bf8ab96155805256.tar.gz llvm-c951960e65961d19cfca9996bf8ab96155805256.tar.bz2 | |
GetClangResourceDir: Fix downstream projects that bundle llvm source
A project that bundles the llvm source code may have their own
PACKAGE_VERSION variable, so only use this to compute the
CLANG_RESOURCE_DIR if CLANG_VERSION_MAJOR is undefined.
Reviewed By: sebastian-ne
Differential Revision: https://reviews.llvm.org/D152608
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Modules/GetClangResourceDir.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmake/Modules/GetClangResourceDir.cmake b/cmake/Modules/GetClangResourceDir.cmake index fb56e611..def5bd6 100644 --- a/cmake/Modules/GetClangResourceDir.cmake +++ b/cmake/Modules/GetClangResourceDir.cmake @@ -12,7 +12,9 @@ function(get_clang_resource_dir out_var) if(DEFINED CLANG_RESOURCE_DIR AND NOT CLANG_RESOURCE_DIR STREQUAL "") set(ret_dir bin/${CLANG_RESOURCE_DIR}) else() - string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${PACKAGE_VERSION}) + if (NOT CLANG_VERSION_MAJOR) + string(REGEX MATCH "^[0-9]+" CLANG_VERSION_MAJOR ${PACKAGE_VERSION}) + endif() set(ret_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION_MAJOR}) endif() |