diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/modules/TableGen.cmake | 14 | ||||
| -rw-r--r-- | lib/Target/CMakeLists.txt | 2 |
3 files changed, 8 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f209338e2c18..08008f9f2277 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -803,6 +803,8 @@ endif() include(AddLLVM) include(TableGen) +set(LLVM_TABLEGEN_FLAGS -I ${LLVM_MAIN_INCLUDE_DIR}) + if( MINGW ) # People report that -O3 is unreliable on MinGW. The traditional # build also uses -O2 for that reason: diff --git a/cmake/modules/TableGen.cmake b/cmake/modules/TableGen.cmake index a366299ab495..f966cf2d6159 100644 --- a/cmake/modules/TableGen.cmake +++ b/cmake/modules/TableGen.cmake @@ -6,15 +6,9 @@ include(LLVMExternalProjectUtils) function(tablegen project ofn) # Validate calling context. - foreach(v - ${project}_TABLEGEN_EXE - LLVM_MAIN_SRC_DIR - LLVM_MAIN_INCLUDE_DIR - ) - if(NOT ${v}) - message(FATAL_ERROR "${v} not set") - endif() - endforeach() + if(NOT ${project}_TABLEGEN_EXE) + message(FATAL_ERROR "${project}_TABLEGEN_EXE not set") + endif() file(GLOB local_tds "*.td") file(GLOB_RECURSE global_tds "${LLVM_MAIN_INCLUDE_DIR}/llvm/*.td") @@ -28,7 +22,7 @@ function(tablegen project ofn) 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} + ${LLVM_TABLEGEN_FLAGS} ${LLVM_TARGET_DEFINITIONS_ABSOLUTE} -o ${CMAKE_CURRENT_BINARY_DIR}/${ofn}.tmp # The file in LLVM_TARGET_DEFINITIONS may be not in the current diff --git a/lib/Target/CMakeLists.txt b/lib/Target/CMakeLists.txt index 02b030004d45..044db10fb3fa 100644 --- a/lib/Target/CMakeLists.txt +++ b/lib/Target/CMakeLists.txt @@ -1,5 +1,7 @@ list(APPEND LLVM_COMMON_DEPENDS intrinsics_gen) +list(APPEND LLVM_TABLEGEN_FLAGS -I ${LLVM_MAIN_SRC_DIR}/lib/Target) + add_llvm_library(LLVMTarget Target.cpp TargetIntrinsicInfo.cpp |