summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Greene <greened@obbligato.org>2019-02-22 21:19:48 +0000
committerDavid Greene <greened@obbligato.org>2019-02-22 21:19:48 +0000
commit3b9141df25dfb9e6811ae76ba8e1870adb63020a (patch)
tree1308e9c75f489830243ff960362f2d663ec7d524
parent07cda257f84ba773ee6dd0b140889c59f6459f39 (diff)
downloadbcm5719-llvm-3b9141df25dfb9e6811ae76ba8e1870adb63020a.tar.gz
bcm5719-llvm-3b9141df25dfb9e6811ae76ba8e1870adb63020a.zip
[CMake] Honor LLVM_EXTERNAL_<proj>_SOURCE_DIR
When LLVM_ENABLE_PROJECTS is set, CMake assumes the project directories are all side-by-side. This is not always the case and there's no reason to expect it if LLVM_EXTERNAL_<proj>_SOURCE_DIR is set. Honor that setting if it exists and allow the build configuration to continue. Differential Revision: https://reviews.llvm.org/D49672 llvm-svn: 354693
-rw-r--r--llvm/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index 418dfa8bc3c..a62c753647c 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -140,7 +140,7 @@ if (LLVM_ENABLE_PROJECTS_USED OR NOT LLVM_ENABLE_PROJECTS STREQUAL "")
if(NOT EXISTS "${PROJ_DIR}" OR NOT IS_DIRECTORY "${PROJ_DIR}")
message(FATAL_ERROR "LLVM_ENABLE_PROJECTS requests ${proj} but directory not found: ${PROJ_DIR}")
endif()
- set(LLVM_EXTERNAL_${upper_proj}_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${proj}")
+ set(LLVM_EXTERNAL_${upper_proj}_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${proj}" CACHE STRING "")
else()
message(STATUS "${proj} project is disabled")
set(SHOULD_ENABLE_PROJECT FALSE)
OpenPOWER on IntegriCloud