diff options
| author | Stefan Granitz <stefan.graenitz@gmail.com> | 2019-09-18 10:20:28 +0000 |
|---|---|---|
| committer | Stefan Granitz <stefan.graenitz@gmail.com> | 2019-09-18 10:20:28 +0000 |
| commit | a206de8a0e6a657b5c5a48e894383590ef942fc7 (patch) | |
| tree | 3adda26e996386b128386b3491f6717f3bae0a50 /lldb/cmake | |
| parent | a84b200e6048211ae74c511a1660fb2c2c5567da (diff) | |
| download | bcm5719-llvm-a206de8a0e6a657b5c5a48e894383590ef942fc7.tar.gz bcm5719-llvm-a206de8a0e6a657b5c5a48e894383590ef942fc7.zip | |
[lldb][CMake] Infer `Clang_DIR` if not passed explicitly
Summary:
If we only get `LLVM_DIR` and find Clang in the same provided build-tree, automatically infer `Clang_DIR` like this:
```
LLVM_DIR = /path/to/build-llvm/lib/cmake/llvm
Clang_DIR = /paht/to/build-llvm/lib/cmake/clang
```
Reviewers: JDevlieghere, jingham, xiaobai, compnerd, labath
Reviewed By: JDevlieghere, labath
Subscribers: mgorny, lldb-commits, #lldb
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D65798
llvm-svn: 372210
Diffstat (limited to 'lldb/cmake')
| -rw-r--r-- | lldb/cmake/modules/LLDBStandalone.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lldb/cmake/modules/LLDBStandalone.cmake b/lldb/cmake/modules/LLDBStandalone.cmake index 4b67d164d1c..752113bcc6c 100644 --- a/lldb/cmake/modules/LLDBStandalone.cmake +++ b/lldb/cmake/modules/LLDBStandalone.cmake @@ -1,7 +1,7 @@ option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF) -find_package(LLVM REQUIRED CONFIG HINTS "${LLVM_DIR}" NO_CMAKE_FIND_ROOT_PATH) -find_package(Clang REQUIRED CONFIG HINTS "${Clang_DIR}" NO_CMAKE_FIND_ROOT_PATH) +find_package(LLVM REQUIRED CONFIG HINTS ${LLVM_DIR} NO_CMAKE_FIND_ROOT_PATH) +find_package(Clang REQUIRED CONFIG HINTS ${Clang_DIR} ${LLVM_DIR}/../clang NO_CMAKE_FIND_ROOT_PATH) # We set LLVM_CMAKE_PATH so that GetSVN.cmake is found correctly when building SVNVersion.inc set(LLVM_CMAKE_PATH ${LLVM_CMAKE_DIR} CACHE PATH "Path to LLVM CMake modules") |
