6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-26 21:32:10 +00:00
Code Issues Projects Releases Wiki Activity

Revert r200150, "[CMake] tablegen(): Use -I <dir> according to the list by include_directories()."

Browse Source 
It missed include/llvm/Target. Could I avoid GLOB_RECURSE anyways? :(
FYI, I intended to prune ${LLVM_MAIN_INCLUDE_DIR} in TableGen.cmake in r200150.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@200730 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
NAKAMURA Takumi 2014-02-04 01:17:12 +00:00
parent 819536857f
commit ee3a79a1e4
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmake/modules/TableGen.cmake
View File

@ -3,16 +3,8 @@
# Adds the name of the generated file to TABLEGEN_OUTPUT. # Adds the name of the generated file to TABLEGEN_OUTPUT.
function(tablegen project ofn) function(tablegen project ofn)
# Use the list by include_directories(). file(GLOB local_tds "*.td")
get_property(include_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES) file(GLOB_RECURSE global_tds "${LLVM_MAIN_INCLUDE_DIR}/llvm/*.td")
# Collect possible dependent *.td(s).
# FIXME: It is far from optimal.
file(GLOB dependent_tds "*.td")
foreach(inc ${include_dirs})
file(GLOB tds "${inc}/*.td")
list(APPEND dependent_tds ${tds})
endforeach()
if (IS_ABSOLUTE ${LLVM_TARGET_DEFINITIONS}) if (IS_ABSOLUTE ${LLVM_TARGET_DEFINITIONS})
set(LLVM_TARGET_DEFINITIONS_ABSOLUTE ${LLVM_TARGET_DEFINITIONS}) set(LLVM_TARGET_DEFINITIONS_ABSOLUTE ${LLVM_TARGET_DEFINITIONS})
@ -20,20 +12,16 @@ function(tablegen project ofn)
set(LLVM_TARGET_DEFINITIONS_ABSOLUTE set(LLVM_TARGET_DEFINITIONS_ABSOLUTE
${CMAKE_CURRENT_SOURCE_DIR}/${LLVM_TARGET_DEFINITIONS}) ${CMAKE_CURRENT_SOURCE_DIR}/${LLVM_TARGET_DEFINITIONS})
endif() endif()
foreach(inc ${include_dirs})
list(APPEND TABLEGEN_INCLUDE_DIRECTORIES -I ${inc})
endforeach()
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
# Generate tablegen output in a temporary file. # Generate tablegen output in a temporary file.
COMMAND ${${project}_TABLEGEN_EXE} ${ARGN} COMMAND ${${project}_TABLEGEN_EXE} ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR}
-I ${CMAKE_CURRENT_SOURCE_DIR} -I ${LLVM_MAIN_SRC_DIR}/lib/Target -I ${LLVM_MAIN_INCLUDE_DIR}
${TABLEGEN_INCLUDE_DIRECTORIES}
${LLVM_TARGET_DEFINITIONS_ABSOLUTE} ${LLVM_TARGET_DEFINITIONS_ABSOLUTE}
-o ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp -o ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp
# The file in LLVM_TARGET_DEFINITIONS may be not in the current # The file in LLVM_TARGET_DEFINITIONS may be not in the current
# directory and local_tds may not contain it, so we must # directory and local_tds may not contain it, so we must
# explicitly list it here: # explicitly list it here:
DEPENDS ${${project}_TABLEGEN_EXE} ${dependent_tds} DEPENDS ${${project}_TABLEGEN_EXE} ${local_tds} ${global_tds}
${LLVM_TARGET_DEFINITIONS_ABSOLUTE} ${LLVM_TARGET_DEFINITIONS_ABSOLUTE}
COMMENT "Building ${ofn}..." COMMENT "Building ${ofn}..."
) )