[PATCH] D65045: [CMake] LLVM_EXTERNAL_<proj>_SOURCE_DIR should be adjustable.

[Yuanfang Chen via Phabricator via llvm-commits]

ychen created this revision.
ychen added reviewers: beanz, greened, chapuni.
Herald added subscribers: llvm-commits, mgorny.
Herald added a project: LLVM.

LLVM_EXTERNAL_<proj>_SOURCE_DIR are cache variables but without `FORCE`
flag. This makes adding projects to LLVM_ENABLE_PROJECTS after config
not take effect. Also its type should be PATH.

https://bugs.llvm.org/show_bug.cgi?id=42698


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D65045

Files:
  llvm/CMakeLists.txt


Index: llvm/CMakeLists.txt
===================================================================
--- llvm/CMakeLists.txt
+++ llvm/CMakeLists.txt
@@ -95,7 +95,7 @@
       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}" CACHE STRING "")
+      set(LLVM_EXTERNAL_${upper_proj}_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${proj}" CACHE PATH "" FORCE)
     elseif ("${proj}" IN_LIST LLVM_EXTERNAL_PROJECTS)
       message(STATUS "${proj} project is enabled")
       set(SHOULD_ENABLE_PROJECT TRUE)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D65045.210980.patch
Type: text/x-patch
Size: 719 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190721/308194dd/attachment.bin>