This is an archive of the discontinued LLVM Phabricator instance.

Differential D25724

[cmake] Declare LLVM_CMAKE_PATH for use in subprojects
ClosedPublic

Authored by mgorny on Oct 18 2016, 5:46 AM.

Details

Reviewers
krytarowski
beanz
Commits
rGe22b7f5aead4: [cmake] Declare LLVM_CMAKE_PATH for use in subprojects
rL284581: [cmake] Declare LLVM_CMAKE_PATH for use in subprojects
Summary

Declare the LLVM_CMAKE_PATH to the source directory location of CMake
files, in order to make it possible to easily use them in subprojects.
Such a variable is already declared in most of LLVM projects
(and inconsistently mixed with direct source tree references), including
Clang, LLDB, compiler-rt, libcxx... Declaring it inside main LLVM tree
makes it possible to avoid having to declare fallback values or use
conditionals in those projects.

It should be noted that in some of the subprojects LLVM_CMAKE_PATH is
used to reference generated LLVMConfig.cmake file. However, these
references are conditional to stand-alone builds and explicitly
including this file is unnecessary in combined builds.

Diff Detail

Repository
rL LLVM

Event Timeline

mgorny updated this revision to Diff 74985.Oct 18 2016, 5:46 AM
mgorny retitled this revision from to [cmake] Declare LLVM_CMAKE_PATH for use in subprojects.
mgorny updated this object.
mgorny added reviewers: beanz, krytarowski.
mgorny added a subscriber: llvm-commits.
Herald added a subscriber: mehdi_amini. · View Herald TranscriptOct 18 2016, 5:46 AM
mgorny mentioned this in D25668: [cmake] Respect LLVM_CMAKE_PATH in stand-alone builds for GetSVN.cmake.Oct 18 2016, 5:47 AM

Please let me know if I should post related patches to other projects for review, or just commit them? Assuming they're pretty much about changing get_svn_script alike in LLVM.

beanz accepted this revision.Oct 18 2016, 2:47 PM
beanz edited edge metadata.

LGTM. Feel free to commit the patches for other projects too. Thanks!

This revision is now accepted and ready to land.Oct 18 2016, 2:47 PM
Closed by commit rL284581: [cmake] Declare LLVM_CMAKE_PATH for use in subprojects (authored by mgorny). · Explain WhyOct 19 2016, 5:27 AM
This revision was automatically updated to reflect the committed changes.
mgorny added a comment.Oct 19 2016, 5:31 AM

Thanks. Committed now, and updates for other projects will follow shortly.

Revision Contents

PathSize
llvm/
trunk/
2 lines
lib/
LTO/
2 lines

Diff 75131

llvm/trunk/CMakeLists.txt

Show First 20 Lines • Show All 257 Lines • ▼ Show 20 Lines
# Each of them corresponds to llvm-config's. # Each of them corresponds to llvm-config's.
set(LLVM_TOOLS_BINARY_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) # --bindir set(LLVM_TOOLS_BINARY_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR}) # --bindir
set(LLVM_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) # --libdir set(LLVM_LIBRARY_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}) # --libdir
set(LLVM_MAIN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR} ) # --src-root set(LLVM_MAIN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR} ) # --src-root
set(LLVM_MAIN_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/include ) # --includedir set(LLVM_MAIN_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/include ) # --includedir
set(LLVM_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} ) # --prefix set(LLVM_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR} ) # --prefix
# Note: LLVM_CMAKE_PATH does not include generated files
set(LLVM_CMAKE_PATH ${LLVM_MAIN_SRC_DIR}/cmake/modules)
set(LLVM_EXAMPLES_BINARY_DIR ${LLVM_BINARY_DIR}/examples) set(LLVM_EXAMPLES_BINARY_DIR ${LLVM_BINARY_DIR}/examples)
set(LLVM_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include) set(LLVM_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include)
set(LLVM_ALL_TARGETS set(LLVM_ALL_TARGETS
AArch64 AArch64
AMDGPU AMDGPU
ARM ARM
BPF BPF
▲ Show 20 Lines • Show All 649 Lines • Show Last 20 Lines

llvm/trunk/lib/LTO/CMakeLists.txt

Show All 15 Lines find_first_existing_file(${out_var}
) )
endmacro() endmacro()
find_first_existing_vc_file(llvm_vc "${LLVM_MAIN_SRC_DIR}") find_first_existing_vc_file(llvm_vc "${LLVM_MAIN_SRC_DIR}")
# The VC revision include that we want to generate. # The VC revision include that we want to generate.
set(version_inc "${CMAKE_CURRENT_BINARY_DIR}/LLVMLTORevision.h") set(version_inc "${CMAKE_CURRENT_BINARY_DIR}/LLVMLTORevision.h")
set(get_svn_script "${LLVM_MAIN_SRC_DIR}/cmake/modules/GenerateVersionFromCVS.cmake") set(get_svn_script "${LLVM_CMAKE_PATH}/GenerateVersionFromCVS.cmake")
if(DEFINED llvm_vc) if(DEFINED llvm_vc)
# Create custom target to generate the VC revision include. # Create custom target to generate the VC revision include.
add_custom_command(OUTPUT "${version_inc}" add_custom_command(OUTPUT "${version_inc}"
DEPENDS "${llvm_vc}" "${get_svn_script}" DEPENDS "${llvm_vc}" "${get_svn_script}"
COMMAND COMMAND
${CMAKE_COMMAND} "-DSOURCE_DIR=${LLVM_MAIN_SRC_DIR}" ${CMAKE_COMMAND} "-DSOURCE_DIR=${LLVM_MAIN_SRC_DIR}"
"-DNAME=LLVM_REVISION" "-DNAME=LLVM_REVISION"
Show All 32 Lines