diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-02-04 01:17:12 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2014-02-04 01:17:12 +0000 |
| commit | ee3a79a1e482e4bef1ebca525ec586dd2d4a69e2 (patch) | |
| tree | 391d794d40ffdf836440452367f1a34065a42f07 /cmake | |
| parent | 819536857fa1b24c48377e0c395a62dd93d3c068 (diff) | |
| download | llvm-ee3a79a1e482e4bef1ebca525ec586dd2d4a69e2.tar.gz llvm-ee3a79a1e482e4bef1ebca525ec586dd2d4a69e2.tar.bz2 llvm-ee3a79a1e482e4bef1ebca525ec586dd2d4a69e2.tar.xz | |
Revert r200150, "[CMake] tablegen(): Use -I <dir> according to the list by include_directories()."
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
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/TableGen.cmake | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/cmake/modules/TableGen.cmake b/cmake/modules/TableGen.cmake index 7b69882dee..b1e1549247 100644 --- a/cmake/modules/TableGen.cmake +++ b/cmake/modules/TableGen.cmake @@ -3,16 +3,8 @@ # Adds the name of the generated file to TABLEGEN_OUTPUT. function(tablegen project ofn) - # Use the list by include_directories(). - get_property(include_dirs DIRECTORY PROPERTY INCLUDE_DIRECTORIES) - - # 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() + file(GLOB local_tds "*.td") + file(GLOB_RECURSE global_tds "${LLVM_MAIN_INCLUDE_DIR}/llvm/*.td") if (IS_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 ${CMAKE_CURRENT_SOURCE_DIR}/${LLVM_TARGET_DEFINITIONS}) endif() - foreach(inc ${include_dirs}) - list(APPEND TABLEGEN_INCLUDE_DIRECTORIES -I ${inc}) - endforeach() add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp # Generate tablegen output in a temporary file. - COMMAND ${${project}_TABLEGEN_EXE} ${ARGN} - -I ${CMAKE_CURRENT_SOURCE_DIR} - ${TABLEGEN_INCLUDE_DIRECTORIES} + COMMAND ${${project}_TABLEGEN_EXE} ${ARGN} -I ${CMAKE_CURRENT_SOURCE_DIR} + -I ${LLVM_MAIN_SRC_DIR}/lib/Target -I ${LLVM_MAIN_INCLUDE_DIR} ${LLVM_TARGET_DEFINITIONS_ABSOLUTE} -o ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp # The file in LLVM_TARGET_DEFINITIONS may be not in the current # directory and local_tds may not contain it, so we must # explicitly list it here: - DEPENDS ${${project}_TABLEGEN_EXE} ${dependent_tds} + DEPENDS ${${project}_TABLEGEN_EXE} ${local_tds} ${global_tds} ${LLVM_TARGET_DEFINITIONS_ABSOLUTE} COMMENT "Building ${ofn}..." ) |