This is an archive of the discontinued LLVM Phabricator instance.

Differential D62289

CMake: allow using LLVM_EXTERNAL_PROJECTS with LLVM_ENABLE_PROJECTS
ClosedPublic

Authored by hans on May 23 2019, 12:40 AM.

Details

Reviewers
smeenai
beanz
Commits
rG0f40585d2d53: Cmake: allow using LLVM_EXTERNAL_PROJECTS with LLVM_ENABLE_PROJECTS
rL361751: Cmake: allow using LLVM_EXTERNAL_PROJECTS with LLVM_ENABLE_PROJECTS
Summary

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.

Diff Detail

Repository
rL LLVM

Event Timeline

hans created this revision.May 23 2019, 12:40 AM
Herald added a project: Restricted Project. · View Herald TranscriptMay 23 2019, 12:40 AM
Herald added a subscriber: mgorny. · View Herald Transcript
smeenai accepted this revision.May 23 2019, 9:15 AM

LGTM

This revision is now accepted and ready to land.May 23 2019, 9:15 AM
beanz accepted this revision.May 23 2019, 10:37 AM

Makes sense to me.

Closed by commit rL361751: Cmake: allow using LLVM_EXTERNAL_PROJECTS with LLVM_ENABLE_PROJECTS (authored by hans). · Explain WhyMay 27 2019, 2:00 AM
This revision was automatically updated to reflect the committed changes.
mehdi_amini mentioned this in D110016: Check for invalid projects passed in LLVM_ENABLE_PROJECTS.Sep 20 2021, 12:58 PM

Revision Contents

PathSize
llvm/
trunk/
3 lines

Diff 201484

llvm/trunk/CMakeLists.txt

Show First 20 Lines • Show All 139 Lines • ▼ Show 20 Lines foreach(proj ${LLVM_ALL_PROJECTS} ${LLVM_EXTERNAL_PROJECTS})
if ("${proj}" IN_LIST LLVM_ENABLE_PROJECTS) if ("${proj}" IN_LIST LLVM_ENABLE_PROJECTS)
message(STATUS "${proj} project is enabled") message(STATUS "${proj} project is enabled")
set(SHOULD_ENABLE_PROJECT TRUE) set(SHOULD_ENABLE_PROJECT TRUE)
set(PROJ_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${proj}") set(PROJ_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${proj}")
if(NOT EXISTS "${PROJ_DIR}" OR NOT IS_DIRECTORY "${PROJ_DIR}") 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}") message(FATAL_ERROR "LLVM_ENABLE_PROJECTS requests ${proj} but directory not found: ${PROJ_DIR}")
endif() 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 STRING "")
elseif ("${proj}" IN_LIST LLVM_EXTERNAL_PROJECTS)
message(STATUS "${proj} project is enabled")
set(SHOULD_ENABLE_PROJECT TRUE)
else() else()
message(STATUS "${proj} project is disabled") message(STATUS "${proj} project is disabled")
set(SHOULD_ENABLE_PROJECT FALSE) set(SHOULD_ENABLE_PROJECT FALSE)
endif() endif()
# Force `LLVM_TOOL_${upper_proj}_BUILD` variables to have values that # Force `LLVM_TOOL_${upper_proj}_BUILD` variables to have values that
# corresponds with `LLVM_ENABLE_PROJECTS`. This prevents the user setting # corresponds with `LLVM_ENABLE_PROJECTS`. This prevents the user setting
# `LLVM_TOOL_${upper_proj}_BUILD` variables externally. At some point # `LLVM_TOOL_${upper_proj}_BUILD` variables externally. At some point
# we should deprecate allowing users to set these variables by turning them # we should deprecate allowing users to set these variables by turning them
▲ Show 20 Lines • Show All 994 Lines • Show Last 20 Lines