mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-12-14 11:32:34 +00:00
Revert r241621, "[CMake] Cleanup tools/CMakeLists.txt to take advantage of the auto-registration that was already partially working."
It broke the build that relies on LLVM_EXTERNAL_CLANG_*. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@241663 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
54a2768153
commit
78cca47fc6
@ -676,13 +676,6 @@ macro(add_llvm_target target_name)
|
|||||||
set( CURRENT_LLVM_TARGET LLVM${target_name} )
|
set( CURRENT_LLVM_TARGET LLVM${target_name} )
|
||||||
endmacro(add_llvm_target)
|
endmacro(add_llvm_target)
|
||||||
|
|
||||||
function(canonicalize_tool_name name output)
|
|
||||||
string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" nameStrip ${name})
|
|
||||||
string(REPLACE "-" "_" nameUNDERSCORE ${nameStrip})
|
|
||||||
string(TOUPPER ${nameUNDERSCORE} nameUPPER)
|
|
||||||
set(${output} "${nameUPPER}" PARENT_SCOPE)
|
|
||||||
endfunction(canonicalize_tool_name)
|
|
||||||
|
|
||||||
# Add external project that may want to be built as part of llvm such as Clang,
|
# Add external project that may want to be built as part of llvm such as Clang,
|
||||||
# lld, and Polly. This adds two options. One for the source directory of the
|
# lld, and Polly. This adds two options. One for the source directory of the
|
||||||
# project, which defaults to ${CMAKE_CURRENT_SOURCE_DIR}/${name}. Another to
|
# project, which defaults to ${CMAKE_CURRENT_SOURCE_DIR}/${name}. Another to
|
||||||
@ -693,43 +686,38 @@ macro(add_llvm_external_project name)
|
|||||||
if("${add_llvm_external_dir}" STREQUAL "")
|
if("${add_llvm_external_dir}" STREQUAL "")
|
||||||
set(add_llvm_external_dir ${name})
|
set(add_llvm_external_dir ${name})
|
||||||
endif()
|
endif()
|
||||||
canonicalize_tool_name(${name} nameUPPER)
|
list(APPEND LLVM_IMPLICIT_PROJECT_IGNORE "${CMAKE_CURRENT_SOURCE_DIR}/${add_llvm_external_dir}")
|
||||||
set(LLVM_TOOL_${nameUPPER}_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${add_llvm_external_dir}"
|
string(REPLACE "-" "_" nameUNDERSCORE ${name})
|
||||||
|
string(TOUPPER ${nameUNDERSCORE} nameUPPER)
|
||||||
|
set(LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${add_llvm_external_dir}"
|
||||||
CACHE PATH "Path to ${name} source directory")
|
CACHE PATH "Path to ${name} source directory")
|
||||||
if (NOT ${LLVM_TOOL_${nameUPPER}_SOURCE_DIR} STREQUAL ""
|
if (NOT ${LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR} STREQUAL ""
|
||||||
AND EXISTS ${LLVM_TOOL_${nameUPPER}_SOURCE_DIR}/CMakeLists.txt)
|
AND EXISTS ${LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR}/CMakeLists.txt)
|
||||||
option(LLVM_TOOL_${nameUPPER}_BUILD
|
option(LLVM_EXTERNAL_${nameUPPER}_BUILD
|
||||||
"Whether to build ${name} as part of LLVM" ON)
|
"Whether to build ${name} as part of LLVM" ON)
|
||||||
if (LLVM_TOOL_${nameUPPER}_BUILD)
|
if (LLVM_EXTERNAL_${nameUPPER}_BUILD)
|
||||||
add_subdirectory(${LLVM_TOOL_${nameUPPER}_SOURCE_DIR} ${add_llvm_external_dir})
|
add_subdirectory(${LLVM_EXTERNAL_${nameUPPER}_SOURCE_DIR} ${add_llvm_external_dir})
|
||||||
set(LLVM_TOOL_${nameUPPER}_BUILD Off)
|
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
endmacro(add_llvm_external_project)
|
endmacro(add_llvm_external_project)
|
||||||
|
|
||||||
macro(add_llvm_tool_subdirectory name)
|
macro(add_llvm_tool_subdirectory name)
|
||||||
set(LLVM_TOOL_${nameUPPER}_BUILD Off)
|
list(APPEND LLVM_IMPLICIT_PROJECT_IGNORE "${CMAKE_CURRENT_SOURCE_DIR}/${name}")
|
||||||
add_subdirectory(${name})
|
add_subdirectory(${name})
|
||||||
endmacro(add_llvm_tool_subdirectory)
|
endmacro(add_llvm_tool_subdirectory)
|
||||||
|
|
||||||
function(create_llvm_tool_options)
|
macro(ignore_llvm_tool_subdirectory name)
|
||||||
file(GLOB sub-dirs "${CMAKE_CURRENT_SOURCE_DIR}/*")
|
list(APPEND LLVM_IMPLICIT_PROJECT_IGNORE "${CMAKE_CURRENT_SOURCE_DIR}/${name}")
|
||||||
foreach(dir ${sub-dirs})
|
endmacro(ignore_llvm_tool_subdirectory)
|
||||||
if(IS_DIRECTORY "${dir}" AND EXISTS "${dir}/CMakeLists.txt")
|
|
||||||
canonicalize_tool_name(${dir} name)
|
|
||||||
option(LLVM_TOOL_${name}_BUILD
|
|
||||||
"Whether to build ${name} as part of LLVM" On)
|
|
||||||
endif()
|
|
||||||
endforeach()
|
|
||||||
endfunction(create_llvm_tool_options)
|
|
||||||
|
|
||||||
function(add_llvm_implicit_projects)
|
function(add_llvm_implicit_external_projects)
|
||||||
set(list_of_implicit_subdirs "")
|
set(list_of_implicit_subdirs "")
|
||||||
file(GLOB sub-dirs "${CMAKE_CURRENT_SOURCE_DIR}/*")
|
file(GLOB sub-dirs "${CMAKE_CURRENT_SOURCE_DIR}/*")
|
||||||
foreach(dir ${sub-dirs})
|
foreach(dir ${sub-dirs})
|
||||||
if(IS_DIRECTORY "${dir}" AND EXISTS "${dir}/CMakeLists.txt")
|
if(IS_DIRECTORY "${dir}")
|
||||||
canonicalize_tool_name(${dir} name)
|
list(FIND LLVM_IMPLICIT_PROJECT_IGNORE "${dir}" tool_subdir_ignore)
|
||||||
if (LLVM_TOOL_${name}_BUILD)
|
if( tool_subdir_ignore EQUAL -1
|
||||||
|
AND EXISTS "${dir}/CMakeLists.txt")
|
||||||
get_filename_component(fn "${dir}" NAME)
|
get_filename_component(fn "${dir}" NAME)
|
||||||
list(APPEND list_of_implicit_subdirs "${fn}")
|
list(APPEND list_of_implicit_subdirs "${fn}")
|
||||||
endif()
|
endif()
|
||||||
@ -739,7 +727,7 @@ function(add_llvm_implicit_projects)
|
|||||||
foreach(external_proj ${list_of_implicit_subdirs})
|
foreach(external_proj ${list_of_implicit_subdirs})
|
||||||
add_llvm_external_project("${external_proj}")
|
add_llvm_external_project("${external_proj}")
|
||||||
endforeach()
|
endforeach()
|
||||||
endfunction(add_llvm_implicit_projects)
|
endfunction(add_llvm_implicit_external_projects)
|
||||||
|
|
||||||
# Generic support for adding a unittest.
|
# Generic support for adding a unittest.
|
||||||
function(add_unittest test_suite test_name)
|
function(add_unittest test_suite test_name)
|
||||||
|
@ -1,37 +1,85 @@
|
|||||||
# This file will recurse into all subdirectories that contain CMakeLists.txt
|
add_llvm_tool_subdirectory(llvm-config)
|
||||||
# Setting variables that match the pattern LLVM_TOOL_{NAME}_BUILD to Off will
|
|
||||||
# prevent traversing into a directory.
|
|
||||||
#
|
|
||||||
# The only tools that need to be explicitly added are ones that have explicit
|
|
||||||
# ordering requirements.
|
|
||||||
|
|
||||||
# Iterates all the subdirectories to create CMake options to enable/disable
|
|
||||||
# traversing each directory.
|
|
||||||
create_llvm_tool_options()
|
|
||||||
|
|
||||||
# Build polly before the tools: the tools link against polly when
|
# Build polly before the tools: the tools link against polly when
|
||||||
# LINK_POLLY_INTO_TOOLS is set.
|
# LINK_POLLY_INTO_TOOLS is set.
|
||||||
if(WITH_POLLY)
|
if(WITH_POLLY)
|
||||||
add_llvm_external_project(polly)
|
add_llvm_external_project(polly)
|
||||||
|
else(WITH_POLLY)
|
||||||
|
list(APPEND LLVM_IMPLICIT_PROJECT_IGNORE "${LLVM_MAIN_SRC_DIR}/tools/polly")
|
||||||
|
endif(WITH_POLLY)
|
||||||
|
|
||||||
|
if( LLVM_BUILD_LLVM_DYLIB )
|
||||||
|
add_llvm_tool_subdirectory(llvm-shlib)
|
||||||
else()
|
else()
|
||||||
set(LLVM_TOOL_POLLY_BUILD Off)
|
ignore_llvm_tool_subdirectory(llvm-shlib)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT LLVM_BUILD_LLVM_DYLIB )
|
add_llvm_tool_subdirectory(opt)
|
||||||
set(LLVM_TOOL_LLVM_SHLIB_BUILD Off)
|
add_llvm_tool_subdirectory(llvm-as)
|
||||||
|
add_llvm_tool_subdirectory(llvm-dis)
|
||||||
|
add_llvm_tool_subdirectory(llvm-mc)
|
||||||
|
|
||||||
|
add_llvm_tool_subdirectory(llc)
|
||||||
|
add_llvm_tool_subdirectory(llvm-ar)
|
||||||
|
add_llvm_tool_subdirectory(llvm-nm)
|
||||||
|
add_llvm_tool_subdirectory(llvm-size)
|
||||||
|
|
||||||
|
add_llvm_tool_subdirectory(llvm-cov)
|
||||||
|
add_llvm_tool_subdirectory(llvm-profdata)
|
||||||
|
add_llvm_tool_subdirectory(llvm-link)
|
||||||
|
add_llvm_tool_subdirectory(lli)
|
||||||
|
|
||||||
|
add_llvm_tool_subdirectory(llvm-extract)
|
||||||
|
add_llvm_tool_subdirectory(llvm-diff)
|
||||||
|
add_llvm_tool_subdirectory(macho-dump)
|
||||||
|
add_llvm_tool_subdirectory(llvm-objdump)
|
||||||
|
add_llvm_tool_subdirectory(llvm-readobj)
|
||||||
|
add_llvm_tool_subdirectory(llvm-rtdyld)
|
||||||
|
add_llvm_tool_subdirectory(llvm-dwarfdump)
|
||||||
|
add_llvm_tool_subdirectory(dsymutil)
|
||||||
|
add_llvm_tool_subdirectory(llvm-cxxdump)
|
||||||
|
if( LLVM_USE_INTEL_JITEVENTS )
|
||||||
|
add_llvm_tool_subdirectory(llvm-jitlistener)
|
||||||
|
else()
|
||||||
|
ignore_llvm_tool_subdirectory(llvm-jitlistener)
|
||||||
|
endif( LLVM_USE_INTEL_JITEVENTS )
|
||||||
|
|
||||||
|
add_llvm_tool_subdirectory(bugpoint)
|
||||||
|
add_llvm_tool_subdirectory(bugpoint-passes)
|
||||||
|
add_llvm_tool_subdirectory(llvm-bcanalyzer)
|
||||||
|
add_llvm_tool_subdirectory(llvm-stress)
|
||||||
|
add_llvm_tool_subdirectory(llvm-mcmarkup)
|
||||||
|
|
||||||
|
add_llvm_tool_subdirectory(verify-uselistorder)
|
||||||
|
|
||||||
|
add_llvm_tool_subdirectory(llvm-symbolizer)
|
||||||
|
|
||||||
|
add_llvm_tool_subdirectory(llvm-c-test)
|
||||||
|
|
||||||
|
add_llvm_tool_subdirectory(obj2yaml)
|
||||||
|
add_llvm_tool_subdirectory(yaml2obj)
|
||||||
|
|
||||||
|
add_llvm_tool_subdirectory(llvm-go)
|
||||||
|
|
||||||
|
add_llvm_tool_subdirectory(llvm-pdbdump)
|
||||||
|
|
||||||
|
if(NOT CYGWIN AND LLVM_ENABLE_PIC)
|
||||||
|
add_llvm_tool_subdirectory(lto)
|
||||||
|
add_llvm_tool_subdirectory(llvm-lto)
|
||||||
|
else()
|
||||||
|
ignore_llvm_tool_subdirectory(lto)
|
||||||
|
ignore_llvm_tool_subdirectory(llvm-lto)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(NOT LLVM_USE_INTEL_JITEVENTS )
|
add_llvm_tool_subdirectory(gold)
|
||||||
set(LLVM_TOOL_LLVM_JITLISTENER_BUILD Off)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(CYGWIN OR NOT LLVM_ENABLE_PIC)
|
add_llvm_external_project(clang)
|
||||||
set(LLVM_TOOL_LTO_BUILD Off)
|
add_llvm_external_project(llgo)
|
||||||
set(LLVM_TOOL_LLVM_LTO_BUILD Off)
|
add_llvm_external_project(lld)
|
||||||
endif()
|
add_llvm_external_project(lldb)
|
||||||
|
|
||||||
# Automatically add remaining sub-directories containing a 'CMakeLists.txt'
|
# Automatically add remaining sub-directories containing a 'CMakeLists.txt'
|
||||||
# file as external projects.
|
# file as external projects.
|
||||||
add_llvm_implicit_projects()
|
add_llvm_implicit_external_projects()
|
||||||
|
|
||||||
set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} PARENT_SCOPE)
|
set(LLVM_COMMON_DEPENDS ${LLVM_COMMON_DEPENDS} PARENT_SCOPE)
|
||||||
|
Loading…
Reference in New Issue
Block a user