[PATCH] D62289: CMake: allow using LLVM_EXTERNAL_PROJECTS with LLVM_ENABLE_PROJECTS

[Hans Wennborg via Phabricator via llvm-commits]

hans created this revision.
hans added reviewers: smeenai, beanz.
Herald added a subscriber: mgorny.
Herald added a project: LLVM.

The current code iterates over the combination of LLVM_EXTERNAL_PROJECTS and LLVM_ENABLE_PROJECTS, but then disables projects that are only in the former. If a project is in LLVM_EXTERNAL_PROJECTS, it should be enabled.

See also llvm-commits thread on r354060.


https://reviews.llvm.org/D62289

Files:
  llvm/CMakeLists.txt


Index: llvm/CMakeLists.txt
===================================================================
--- llvm/CMakeLists.txt
+++ llvm/CMakeLists.txt
@@ -145,6 +145,9 @@
         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 "")
+    elseif ("${proj}" IN_LIST LLVM_EXTERNAL_PROJECTS)
+      message(STATUS "${proj} project is enabled")
+      set(SHOULD_ENABLE_PROJECT TRUE)
     else()
       message(STATUS "${proj} project is disabled")
       set(SHOULD_ENABLE_PROJECT FALSE)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D62289.200879.patch
Type: text/x-patch
Size: 644 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190523/62ce5552/attachment.bin>