This is an archive of the discontinued LLVM Phabricator instance.

Differential D137299

Fixing flang's definition of MLIR_MAIN_SRC_DIR
ClosedPublic

Authored by Renaud-K on Nov 2 2022, 4:08 PM.

Details

Reviewers
jeanPerier
vzakhari
nicolasvasilache
Commits
rGe2dd63340d8c: Fixing flang's definition of MLIR_MAIN_SRC_DIR
Summary

We have set MLIR_MAIN_SRC_DIR and MLIR_INCLUDE_DIR to the same path

While in MLIR they are set as:

set(MLIR_MAIN_SRC_DIR     ${CMAKE_CURRENT_SOURCE_DIR}  )
set(MLIR_MAIN_INCLUDE_DIR ${MLIR_MAIN_SRC_DIR}/include )

Diff Detail

Revision Contents

PathSize
flang/
4 lines
include/
flang/
Optimizer/
Dialect/
2 lines

Diff 472799

flang/CMakeLists.txt

Show First 20 Lines • Show All 194 Lines • ▼ Show 20 Lineselse()
set(FLANG_GTEST_AVAIL 1) set(FLANG_GTEST_AVAIL 1)
if(FLANG_STANDALONE_BUILD) if(FLANG_STANDALONE_BUILD)
set(FLANG_BINARY_DIR ${CMAKE_BINARY_DIR}/tools/flang) set(FLANG_BINARY_DIR ${CMAKE_BINARY_DIR}/tools/flang)
else() else()
set(FLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(FLANG_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
endif() endif()
set(MLIR_MAIN_SRC_DIR ${LLVM_MAIN_SRC_DIR}/../mlir/include ) # --src-root set(MLIR_MAIN_SRC_DIR ${LLVM_MAIN_SRC_DIR}/../mlir ) # --src-root
set(MLIR_INCLUDE_DIR ${LLVM_MAIN_SRC_DIR}/../mlir/include ) # --includedir set(MLIR_INCLUDE_DIR ${MLIR_MAIN_SRC_DIR}/include ) # --includedir
set(MLIR_TABLEGEN_OUTPUT_DIR ${CMAKE_BINARY_DIR}/tools/mlir/include) set(MLIR_TABLEGEN_OUTPUT_DIR ${CMAKE_BINARY_DIR}/tools/mlir/include)
include_directories(SYSTEM ${MLIR_INCLUDE_DIR}) include_directories(SYSTEM ${MLIR_INCLUDE_DIR})
include_directories(SYSTEM ${MLIR_TABLEGEN_OUTPUT_DIR}) include_directories(SYSTEM ${MLIR_TABLEGEN_OUTPUT_DIR})
endif() endif()
set(FLANG_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH set(FLANG_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
"Path for binary subdirectory (defaults to '${CMAKE_INSTALL_BINDIR}')") "Path for binary subdirectory (defaults to '${CMAKE_INSTALL_BINDIR}')")
mark_as_advanced(FLANG_TOOLS_INSTALL_DIR) mark_as_advanced(FLANG_TOOLS_INSTALL_DIR)
▲ Show 20 Lines • Show All 273 Lines • Show Last 20 Lines

flang/include/flang/Optimizer/Dialect/CMakeLists.txt

Show All 20 Lines
set(LLVM_TARGET_DEFINITIONS CanonicalizationPatterns.td) set(LLVM_TARGET_DEFINITIONS CanonicalizationPatterns.td)
mlir_tablegen(CanonicalizationPatterns.inc -gen-rewriters) mlir_tablegen(CanonicalizationPatterns.inc -gen-rewriters)
add_public_tablegen_target(CanonicalizationPatternsIncGen) add_public_tablegen_target(CanonicalizationPatternsIncGen)
add_custom_target(flang-doc) add_custom_target(flang-doc)
set(dialect_doc_filename "FIRLangRef") set(dialect_doc_filename "FIRLangRef")
set(LLVM_TARGET_DEFINITIONS FIROps.td) set(LLVM_TARGET_DEFINITIONS FIROps.td)
tablegen(MLIR ${dialect_doc_filename}.md -gen-op-doc "-I${MLIR_MAIN_SRC_DIR}" "-I${MLIR_INCLUDE_DIR}") tablegen(MLIR ${dialect_doc_filename}.md -gen-op-doc "-I${MLIR_INCLUDE_DIR}")
set(GEN_DOC_FILE ${FLANG_BINARY_DIR}/docs/Dialect/${dialect_doc_filename}.md) set(GEN_DOC_FILE ${FLANG_BINARY_DIR}/docs/Dialect/${dialect_doc_filename}.md)
add_custom_command( add_custom_command(
OUTPUT ${GEN_DOC_FILE} OUTPUT ${GEN_DOC_FILE}
COMMAND ${CMAKE_COMMAND} -E copy COMMAND ${CMAKE_COMMAND} -E copy
${CMAKE_CURRENT_BINARY_DIR}/${dialect_doc_filename}.md ${CMAKE_CURRENT_BINARY_DIR}/${dialect_doc_filename}.md
${GEN_DOC_FILE} ${GEN_DOC_FILE}
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${dialect_doc_filename}.md) DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${dialect_doc_filename}.md)
add_custom_target(${dialect_doc_filename}DocGen DEPENDS ${GEN_DOC_FILE}) add_custom_target(${dialect_doc_filename}DocGen DEPENDS ${GEN_DOC_FILE})
add_dependencies(flang-doc ${dialect_doc_filename}DocGen) add_dependencies(flang-doc ${dialect_doc_filename}DocGen)