[llvm] r200150 - [CMake] tablegen(): Use -I <dir> according to the list by include_directories().
NAKAMURA Takumi
geek4civic at gmail.com
Sun Jan 26 04:41:38 PST 2014
Author: chapuni
Date: Sun Jan 26 06:41:38 2014
New Revision: 200150
URL: http://llvm.org/viewvc/llvm-project?rev=200150&view=rev
Log:
[CMake] tablegen(): Use -I <dir> according to the list by include_directories().
For now, local_tds and global_tds are integrated to dependent_tds.
Modified:
llvm/trunk/cmake/modules/TableGen.cmake
Modified: llvm/trunk/cmake/modules/TableGen.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/TableGen.cmake?rev=200150&r1=200149&r2=200150&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/TableGen.cmake (original)
+++ llvm/trunk/cmake/modules/TableGen.cmake Sun Jan 26 06:41:38 2014
@@ -3,8 +3,16 @@
# Adds the name of the generated file to TABLEGEN_OUTPUT.
function(tablegen project ofn)
- file(GLOB local_tds "*.td")
- file(GLOB_RECURSE global_tds "${LLVM_MAIN_INCLUDE_DIR}/llvm/*.td")
+ # 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()
if (IS_ABSOLUTE ${LLVM_TARGET_DEFINITIONS})
set(LLVM_TARGET_DEFINITIONS_ABSOLUTE ${LLVM_TARGET_DEFINITIONS})
@@ -12,16 +20,20 @@ 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}
- -I ${LLVM_MAIN_SRC_DIR}/lib/Target -I ${LLVM_MAIN_INCLUDE_DIR}
+ COMMAND ${${project}_TABLEGEN_EXE} ${ARGN}
+ -I ${CMAKE_CURRENT_SOURCE_DIR}
+ ${TABLEGEN_INCLUDE_DIRECTORIES}
${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} ${local_tds} ${global_tds}
+ DEPENDS ${${project}_TABLEGEN_EXE} ${dependent_tds}
${LLVM_TARGET_DEFINITIONS_ABSOLUTE}
COMMENT "Building ${ofn}..."
)
More information about the llvm-commits
mailing list