This is an archive of the discontinued LLVM Phabricator instance.

Differential D73123

[CMake] Fixes for including LLVM into another CMake project
Needs ReviewPublic

Authored by russell.gallop on Jan 21 2020, 10:15 AM.

Details

Reviewers
chandlerc
dcoughlin
jroelofs
mgorny
pcc
tstellar
beanz
dsanders
Summary

This fixes a couple of paths to allow add_subdirectory(llvm) from a higher level CMake project. Otherwise should be NFC.

Tested by creating a top level CMakeLists.txt in llvm-project:

cmake_minimum_required(VERSION 3.4.3)

project(my-super-project)

add_subdirectory(llvm)

And pointing cmake at that instead of llvm/CMakeLists.txt.

In this arrangement, most things are built inside an llvm directory inside the build directory. Some tools and files aren't which causes some test fails. This makes things consistent by changing CMAKE_BINARY_DIR to LLVM_BINARY_DIR and CMAKE_SOURCE_DIR to LLVM_SOURCE_DIR.

Diff Detail

Event Timeline

russell.gallop created this revision.Jan 21 2020, 10:15 AM
Herald added projects: Restricted Project, Restricted Project. · View Herald TranscriptJan 21 2020, 10:15 AM
Herald added subscribers: cfe-commits, Charusso. · View Herald Transcript
gbedwell added a subscriber: gbedwell.Jan 23 2020, 7:17 AM
ormris added a subscriber: ormris.Jan 23 2020, 4:44 PM
jhenderson added a subscriber: jhenderson.May 4 2020, 2:56 AM

Revision Contents

PathSize
clang/
tools/
scan-build/
32 lines
scan-view/
16 lines
utils/
hmaptool/
8 lines
llvm/
tools/
llvm-go/
2 lines
llvm-shlib/
2 lines
unittests/
TableGen/
2 lines

Diff 239361

clang/tools/scan-build/CMakeLists.txt

Show All 27 Lines
set(ShareFiles set(ShareFiles
scanview.css scanview.css
sorttable.js) sorttable.js)
if(CLANG_INSTALL_SCANBUILD) if(CLANG_INSTALL_SCANBUILD)
foreach(BinFile ${BinFiles}) foreach(BinFile ${BinFiles})
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/bin/${BinFile} add_custom_command(OUTPUT ${LLVM_BINARY_DIR}/bin/${BinFile}
COMMAND ${CMAKE_COMMAND} -E make_directory COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_BINARY_DIR}/bin ${LLVM_BINARY_DIR}/bin
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile} ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}
${CMAKE_BINARY_DIR}/bin/ ${LLVM_BINARY_DIR}/bin/
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) list(APPEND Depends ${LLVM_BINARY_DIR}/bin/${BinFile})
install(PROGRAMS bin/${BinFile} install(PROGRAMS bin/${BinFile}
DESTINATION bin DESTINATION bin
COMPONENT scan-build) COMPONENT scan-build)
endforeach() endforeach()
foreach(LibexecFile ${LibexecFiles}) foreach(LibexecFile ${LibexecFiles})
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/libexec/${LibexecFile} add_custom_command(OUTPUT ${LLVM_BINARY_DIR}/libexec/${LibexecFile}
COMMAND ${CMAKE_COMMAND} -E make_directory COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_BINARY_DIR}/libexec ${LLVM_BINARY_DIR}/libexec
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile} ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}
${CMAKE_BINARY_DIR}/libexec/ ${LLVM_BINARY_DIR}/libexec/
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/libexec/${LibexecFile})
list(APPEND Depends ${CMAKE_BINARY_DIR}/libexec/${LibexecFile}) list(APPEND Depends ${LLVM_BINARY_DIR}/libexec/${LibexecFile})
install(PROGRAMS libexec/${LibexecFile} install(PROGRAMS libexec/${LibexecFile}
DESTINATION libexec DESTINATION libexec
COMPONENT scan-build) COMPONENT scan-build)
endforeach() endforeach()
foreach(ManPage ${ManPages}) foreach(ManPage ${ManPages})
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_MANDIR}/man1/${ManPage} add_custom_command(OUTPUT ${LLVM_BINARY_DIR}/${CMAKE_INSTALL_MANDIR}/man1/${ManPage}
COMMAND ${CMAKE_COMMAND} -E make_directory COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_MANDIR}/man1 ${LLVM_BINARY_DIR}/${CMAKE_INSTALL_MANDIR}/man1
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/man/${ManPage} ${CMAKE_CURRENT_SOURCE_DIR}/man/${ManPage}
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_MANDIR}/man1/ ${LLVM_BINARY_DIR}/${CMAKE_INSTALL_MANDIR}/man1/
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/man/${ManPage}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/man/${ManPage})
list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_MANDIR}/man1/${ManPage}) list(APPEND Depends ${LLVM_BINARY_DIR}/${CMAKE_INSTALL_MANDIR}/man1/${ManPage})
install(PROGRAMS man/${ManPage} install(PROGRAMS man/${ManPage}
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
COMPONENT scan-build) COMPONENT scan-build)
endforeach() endforeach()
foreach(ShareFile ${ShareFiles}) foreach(ShareFile ${ShareFiles})
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile} add_custom_command(OUTPUT ${LLVM_BINARY_DIR}/share/scan-build/${ShareFile}
COMMAND ${CMAKE_COMMAND} -E make_directory COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_BINARY_DIR}/share/scan-build ${LLVM_BINARY_DIR}/share/scan-build
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile} ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}
${CMAKE_BINARY_DIR}/share/scan-build/ ${LLVM_BINARY_DIR}/share/scan-build/
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/scan-build/${ShareFile})
list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-build/${ShareFile}) list(APPEND Depends ${LLVM_BINARY_DIR}/share/scan-build/${ShareFile})
install(FILES share/scan-build/${ShareFile} install(FILES share/scan-build/${ShareFile}
DESTINATION share/scan-build DESTINATION share/scan-build
COMPONENT scan-build) COMPONENT scan-build)
endforeach() endforeach()
add_custom_target(scan-build ALL DEPENDS ${Depends}) add_custom_target(scan-build ALL DEPENDS ${Depends})
set_target_properties(scan-build PROPERTIES FOLDER "Misc") set_target_properties(scan-build PROPERTIES FOLDER "Misc")
if(NOT LLVM_ENABLE_IDE) if(NOT LLVM_ENABLE_IDE)
add_llvm_install_targets("install-scan-build" add_llvm_install_targets("install-scan-build"
DEPENDS scan-build DEPENDS scan-build
COMPONENT scan-build) COMPONENT scan-build)
endif() endif()
endif() endif()

clang/tools/scan-view/CMakeLists.txt

option(CLANG_INSTALL_SCANVIEW "Install the scan-view tool" ON) option(CLANG_INSTALL_SCANVIEW "Install the scan-view tool" ON)
set(BinFiles set(BinFiles
scan-view) scan-view)
set(ShareFiles set(ShareFiles
ScanView.py ScanView.py
Reporter.py Reporter.py
startfile.py startfile.py
FileRadar.scpt FileRadar.scpt
GetRadarVersion.scpt GetRadarVersion.scpt
bugcatcher.ico) bugcatcher.ico)
if(CLANG_INSTALL_SCANVIEW) if(CLANG_INSTALL_SCANVIEW)
foreach(BinFile ${BinFiles}) foreach(BinFile ${BinFiles})
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/bin/${BinFile} add_custom_command(OUTPUT ${LLVM_BINARY_DIR}/bin/${BinFile}
COMMAND ${CMAKE_COMMAND} -E make_directory COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_BINARY_DIR}/bin ${LLVM_BINARY_DIR}/bin
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile} ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}
${CMAKE_BINARY_DIR}/bin/ ${LLVM_BINARY_DIR}/bin/
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile}) list(APPEND Depends ${LLVM_BINARY_DIR}/bin/${BinFile})
install(PROGRAMS bin/${BinFile} install(PROGRAMS bin/${BinFile}
DESTINATION bin DESTINATION bin
COMPONENT scan-view) COMPONENT scan-view)
endforeach() endforeach()
foreach(ShareFile ${ShareFiles}) foreach(ShareFile ${ShareFiles})
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile} add_custom_command(OUTPUT ${LLVM_BINARY_DIR}/share/scan-view/${ShareFile}
COMMAND ${CMAKE_COMMAND} -E make_directory COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_BINARY_DIR}/share/scan-view ${LLVM_BINARY_DIR}/share/scan-view
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile} ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}
${CMAKE_BINARY_DIR}/share/scan-view/ ${LLVM_BINARY_DIR}/share/scan-view/
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/share/${ShareFile})
list(APPEND Depends ${CMAKE_BINARY_DIR}/share/scan-view/${ShareFile}) list(APPEND Depends ${LLVM_BINARY_DIR}/share/scan-view/${ShareFile})
install(FILES share/${ShareFile} install(FILES share/${ShareFile}
DESTINATION share/scan-view DESTINATION share/scan-view
COMPONENT scan-view) COMPONENT scan-view)
endforeach() endforeach()
add_custom_target(scan-view ALL DEPENDS ${Depends}) add_custom_target(scan-view ALL DEPENDS ${Depends})
set_target_properties(scan-view PROPERTIES FOLDER "Misc") set_target_properties(scan-view PROPERTIES FOLDER "Misc")
if(NOT LLVM_ENABLE_IDE) if(NOT LLVM_ENABLE_IDE)
add_llvm_install_targets("install-scan-view" add_llvm_install_targets("install-scan-view"
DEPENDS scan-view DEPENDS scan-view
COMPONENT scan-view) COMPONENT scan-view)
endif() endif()
endif() endif()

clang/utils/hmaptool/CMakeLists.txt

set(CLANG_HMAPTOOL hmaptool) set(CLANG_HMAPTOOL hmaptool)
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL} add_custom_command(OUTPUT ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}
COMMAND ${CMAKE_COMMAND} -E make_directory COMMAND ${CMAKE_COMMAND} -E make_directory
${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_SOURCE_DIR}/${CLANG_HMAPTOOL} ${CMAKE_CURRENT_SOURCE_DIR}/${CLANG_HMAPTOOL}
${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/ ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${CLANG_HMAPTOOL}) DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${CLANG_HMAPTOOL})
list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL}) list(APPEND Depends ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL})
install(PROGRAMS ${CLANG_HMAPTOOL} install(PROGRAMS ${CLANG_HMAPTOOL}
DESTINATION bin DESTINATION bin
COMPONENT hmaptool) COMPONENT hmaptool)
add_custom_target(hmaptool ALL DEPENDS ${Depends}) add_custom_target(hmaptool ALL DEPENDS ${Depends})
set_target_properties(hmaptool PROPERTIES FOLDER "Utils") set_target_properties(hmaptool PROPERTIES FOLDER "Utils")
if(NOT LLVM_ENABLE_IDE) if(NOT LLVM_ENABLE_IDE)
add_llvm_install_targets("install-hmaptool" add_llvm_install_targets("install-hmaptool"
DEPENDS hmaptool DEPENDS hmaptool
COMPONENT hmaptool) COMPONENT hmaptool)
endif() endif()

llvm/tools/llvm-go/CMakeLists.txt

if(LLVM_BINDINGS MATCHES "go") if(LLVM_BINDINGS MATCHES "go")
set(binpath ${CMAKE_BINARY_DIR}/bin/llvm-go${CMAKE_EXECUTABLE_SUFFIX}) set(binpath ${LLVM_BINARY_DIR}/bin/llvm-go${CMAKE_EXECUTABLE_SUFFIX})
add_custom_command(OUTPUT ${binpath} add_custom_command(OUTPUT ${binpath}
COMMAND ${GO_EXECUTABLE} build -o ${binpath} llvm-go.go COMMAND ${GO_EXECUTABLE} build -o ${binpath} llvm-go.go
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/llvm-go.go DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/llvm-go.go
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Building Go executable llvm-go") COMMENT "Building Go executable llvm-go")
add_custom_target(llvm-go ALL DEPENDS ${binpath}) add_custom_target(llvm-go ALL DEPENDS ${binpath})
endif() endif()

llvm/tools/llvm-shlib/CMakeLists.txt

Show First 20 Lines • Show All 123 Lines • ▼ Show 20 Linesif(MSVC)
endif() endif()
# Set this name here, not used in multi conf loop, # Set this name here, not used in multi conf loop,
# but add script will pick the right one. # but add script will pick the right one.
set(LIBSFILE ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllvm-c.args) set(LIBSFILE ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/libllvm-c.args)
# Get the full name to the libs so the python script understands them. # Get the full name to the libs so the python script understands them.
foreach(lib ${LIB_NAMES}) foreach(lib ${LIB_NAMES})
list(APPEND FULL_LIB_NAMES ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/${lib}.lib) list(APPEND FULL_LIB_NAMES ${LLVM_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/${lib}.lib)
endforeach() endforeach()
# Need to seperate lib names with newlines. # Need to seperate lib names with newlines.
string(REPLACE ";" "\n" FILE_CONTENT "${FULL_LIB_NAMES}") string(REPLACE ";" "\n" FILE_CONTENT "${FULL_LIB_NAMES}")
if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".") if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
foreach(BUILD_MODE ${CMAKE_CONFIGURATION_TYPES}) foreach(BUILD_MODE ${CMAKE_CONFIGURATION_TYPES})
# Replace the special string with a per config directory. # Replace the special string with a per config directory.
Show All 35 Lines

llvm/unittests/TableGen/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
TableGen TableGen
Support Support
) )
set(LLVM_TARGET_DEFINITIONS Automata.td) set(LLVM_TARGET_DEFINITIONS Automata.td)
tablegen(LLVM AutomataTables.inc -gen-searchable-tables) tablegen(LLVM AutomataTables.inc -gen-searchable-tables)
tablegen(LLVM AutomataAutomata.inc -gen-automata) tablegen(LLVM AutomataAutomata.inc -gen-automata)
add_public_tablegen_target(AutomataTestTableGen) add_public_tablegen_target(AutomataTestTableGen)
add_llvm_unittest(TableGenTests add_llvm_unittest(TableGenTests
CodeExpanderTest.cpp CodeExpanderTest.cpp
AutomataTest.cpp AutomataTest.cpp
) )
include_directories(${CMAKE_SOURCE_DIR}/utils/TableGen) include_directories(${LLVM_SOURCE_DIR}/utils/TableGen)
target_link_libraries(TableGenTests PRIVATE LLVMTableGenGlobalISel LLVMTableGen) target_link_libraries(TableGenTests PRIVATE LLVMTableGenGlobalISel LLVMTableGen)