diff options
| author | Tom Stellard <tstellar@redhat.com> | 2019-02-20 01:11:05 +0000 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2019-02-20 01:11:05 +0000 |
| commit | b8a9fcc602a0cc4d91b0d05d1af4f779b8499026 (patch) | |
| tree | 47181b44e15fa5a464c0c873327589db314602e8 | |
| parent | 8a28ce1a123a79b6de86a0870c130f6db7e19e7e (diff) | |
| download | bcm5719-llvm-b8a9fcc602a0cc4d91b0d05d1af4f779b8499026.tar.gz bcm5719-llvm-b8a9fcc602a0cc4d91b0d05d1af4f779b8499026.zip | |
CMake: Fix stand-alone clang builds since r353268
Summary:
Handle the case where LLVM_MAIN_SRC_DIR is not set and also use
LLVM_CMAKE_DIR for locating installed cmake files rather than
LLVM_CMAKE_PATH.
Reviewers: phosek, andrewrk, smeenai
Reviewed By: phosek, andrewrk, smeenai
Subscribers: mgorny, cfe-commits, llvm-commits
Tags: #clang, #llvm
Differential Revision: https://reviews.llvm.org/D58204
llvm-svn: 354417
| -rw-r--r-- | clang/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | llvm/cmake/modules/AddLLVM.cmake | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index 40cf7dfdf60..f74837c1ae5 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -75,6 +75,11 @@ if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR ) set(LIBRARY_DIR ${LLVM_LIBRARY_DIR}) set(INCLUDE_DIR ${LLVM_INCLUDE_DIR}) set(LLVM_OBJ_DIR ${LLVM_BINARY_DIR}) + # The LLVM_CMAKE_PATH variable is set when doing non-standalone builds and + # used in this project, so we need to make sure we set this value. + # FIXME: LLVM_CMAKE_DIR comes from LLVMConfig.cmake. We should rename + # LLVM_CMAKE_PATH to LLVM_CMAKE_DIR throughout the project. + set(LLVM_CMAKE_PATH ${LLVM_CMAKE_DIR}) endif() set(LLVM_TOOLS_BINARY_DIR ${TOOLS_BINARY_DIR} CACHE PATH "Path to llvm/bin") diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index 95a88af3bbf..34327432bf7 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -1718,6 +1718,9 @@ function(setup_dependency_debugging name) endfunction() function(find_first_existing_vc_file path out_var) + if(NOT EXISTS "${path}") + return() + endif() if(EXISTS "${path}/.svn") set(svn_files "${path}/.svn/wc.db" # SVN 1.7 |
