This is an archive of the discontinued LLVM Phabricator instance.

Differential D26365

Add experimental support for unofficial monorepo-like directory layout
ClosedPublic

Authored by mehdi_amini on Nov 7 2016, 12:18 PM.

Details

Reviewers
beanz
jlebar
bogner
Commits
rG1eed06a3795d: Add experimental support for unofficial monorepo-like directory layout
rL286162: Add experimental support for unofficial monorepo-like directory layout
Summary

This allows to have clang and llvm and the other subprojects
side-by-side instead of nested. This can be used with the monorepo or
multiple repos.

It will help having a single set of sources checked out but allows to
have a build directory with llvm and another one with llvm+clang.
Basically it abstracts LLVM_EXTERNAL_xxxx_SOURCE_DIR making it more
convenient by adopting a convention.

Diff Detail

Event Timeline

mehdi_amini updated this revision to Diff 77079.Nov 7 2016, 12:18 PM
mehdi_amini retitled this revision from to Add experimental support for unofficial monorepo-like directory layout.
mehdi_amini updated this object.
mehdi_amini added reviewers: bogner, beanz, jlebar.
mehdi_amini added a subscriber: llvm-commits.
Herald added a subscriber: mgorny. · View Herald TranscriptNov 7 2016, 12:18 PM
mehdi_amini updated this revision to Diff 77080.Nov 7 2016, 12:23 PM

Document the new cmake flag

mehdi_amini updated this revision to Diff 77084.Nov 7 2016, 12:55 PM

Update the comment in CMake

azharudd added a subscriber: azharudd.Nov 7 2016, 1:28 PM
mehdi_amini updated this revision to Diff 77100.Nov 7 2016, 2:12 PM

Add a comment on the magic for clang-tools-extra

Closed by commit rL286162: Add experimental support for unofficial monorepo-like directory layout (authored by mehdi_amini). · Explain WhyNov 7 2016, 2:23 PM
This revision was automatically updated to reflect the committed changes.
beanz edited edge metadata.Nov 7 2016, 4:49 PM

We should abstract this into a module that can be re-used and not have it implemented directly in the LLVM top-level CMakeLists. As an example other projects could use this code for out-of-tree builds to identify source directories for projects.

mehdi_amini added a comment.Nov 7 2016, 4:54 PM
In D26365#588857, @beanz wrote:

We should abstract this into a module that can be re-used and not have it implemented directly in the LLVM top-level CMakeLists. As an example other projects could use this code for out-of-tree builds to identify source directories for projects.

I can try!

Can you elaborate a little about the "other projects" case? You mean out-of-tree projects like Swift or in-tree projects like compiler-rt (or both)?

beanz added a comment.Nov 7 2016, 7:44 PM

As an example libcxx has goop to find libcxxabi and libunwind's source directories. This code could be in a module so that those projects could use a common module instead of hand-rolling the code.

mehdi_amini added a comment.Nov 7 2016, 7:59 PM
In D26365#588952, @beanz wrote:

As an example libcxx has goop to find libcxxabi and libunwind's source directories. This code could be in a module so that those projects could use a common module instead of hand-rolling the code.

OK, makes sense, I will work on this.

Revision Contents

PathSize
llvm/
19 lines

Diff 77079

llvm/CMakeLists.txt

Show First 20 Lines • Show All 87 Lines • ▼ Show 20 Lines foreach(lang ${languages})
"${dyld_envar} ${cmd}") "${dyld_envar} ${cmd}")
endforeach() endforeach()
set(CMAKE_${lang}_CREATE_STATIC_LIBRARY set(CMAKE_${lang}_CREATE_STATIC_LIBRARY
${CMAKE_${lang}_CREATE_STATIC_LIBRARY_NEW}) ${CMAKE_${lang}_CREATE_STATIC_LIBRARY_NEW})
endforeach() endforeach()
endif() endif()
endif() endif()
# Git Mono-Repo handling: automatically set the LLVM_EXTERNAL_${project}_SOURCE_DIR
set(LLVM_ALL_PROJECTS "clang;libcxx;libcxxabi;lldb;compiler-rt;lld;polly")
set(LLVM_ENABLE_PROJECTS "" CACHE STRING
"Semicolon-separated list of projects to build (${LLVM_ALL_PROJECTS}), or \"all\".")
if( LLVM_ENABLE_PROJECTS STREQUAL "all" )
set( LLVM_ENABLE_PROJECTS ${LLVM_ALL_PROJECTS})
endif()
foreach(proj ${LLVM_ENABLE_PROJECTS})
set(PROJ_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${proj}")
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()
string(TOUPPER "${proj}" upper_proj)
set(LLVM_EXTERNAL_${upper_proj}_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../${proj}")
if (proj STREQUAL "clang")
set(LLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../clang-tools-extra")
endif()
endforeach()
# The following only works with the Ninja generator in CMake >= 3.0. # The following only works with the Ninja generator in CMake >= 3.0.
set(LLVM_PARALLEL_COMPILE_JOBS "" CACHE STRING set(LLVM_PARALLEL_COMPILE_JOBS "" CACHE STRING
"Define the maximum number of concurrent compilation jobs.") "Define the maximum number of concurrent compilation jobs.")
if(LLVM_PARALLEL_COMPILE_JOBS) if(LLVM_PARALLEL_COMPILE_JOBS)
if(NOT CMAKE_MAKE_PROGRAM MATCHES "ninja") if(NOT CMAKE_MAKE_PROGRAM MATCHES "ninja")
message(WARNING "Job pooling is only available with Ninja generators.") message(WARNING "Job pooling is only available with Ninja generators.")
else() else()
set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${LLVM_PARALLEL_COMPILE_JOBS}) set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${LLVM_PARALLEL_COMPILE_JOBS})
▲ Show 20 Lines • Show All 812 Lines • Show Last 20 Lines