diff --git a/MLIR.cmake b/MLIR.cmake index 4f87d3b..15ed11e 100644 --- a/MLIR.cmake +++ b/MLIR.cmake @@ -35,7 +35,7 @@ set(MLIR_BIN_INCLUDE_PATH ${LLVM_PROJ_BUILD}/tools/mlir/include) set(MLIR_TOOLS_DIR ${LLVM_PROJ_BUILD}/bin) set(ONNX_MLIR_TOOLS_DIR ${ONNX_MLIR_BIN_ROOT}/bin) -set(ONNX_MLIR_LIT_TEST_SRC_DIR ${CMAKE_SOURCE_DIR}/test/mlir) +set(ONNX_MLIR_LIT_TEST_SRC_DIR ${ONNX_MLIR_SRC_ROOT}/test/mlir) set(ONNX_MLIR_LIT_TEST_BUILD_DIR ${CMAKE_BINARY_DIR}/test/mlir) set( diff --git a/doc/doc_check/CMakeLists.txt b/doc/doc_check/CMakeLists.txt index c147960..988bfa4 100644 --- a/doc/doc_check/CMakeLists.txt +++ b/doc/doc_check/CMakeLists.txt @@ -3,6 +3,6 @@ find_package(PythonInterp 3 REQUIRED) add_custom_target(check-doc COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/check.py - ${CMAKE_SOURCE_DIR} + ${ONNX_MLIR_SRC_ROOT} --exclude_dirs third_party doc/doc_check/test) diff --git a/src/Builder/CMakeLists.txt b/src/Builder/CMakeLists.txt index 147d4fb..573abd8 100644 --- a/src/Builder/CMakeLists.txt +++ b/src/Builder/CMakeLists.txt @@ -5,8 +5,9 @@ add_library(OMBuilder FrontendDialectTransformer.hpp OpBuildTable.inc) -target_include_directories(OMBuilder PRIVATE ${CMAKE_SOURCE_DIR}) +target_include_directories(OMBuilder PRIVATE ${ONNX_MLIR_SRC_ROOT}) target_include_directories(OMBuilder PRIVATE ${CMAKE_BINARY_DIR}) +target_include_directories(OMBuilder PRIVATE ${ONNX_MLIR_BIN_ROOT}) target_link_libraries(OMBuilder OMONNXOps @@ -16,6 +17,6 @@ target_link_libraries(OMBuilder mpark_variant) target_include_directories(OMBuilder PUBLIC - ${CMAKE_SOURCE_DIR}/third_party/onnx - ${CMAKE_SOURCE_DIR}/third_party/variant - ${CMAKE_SOURCE_DIR}) + ${ONNX_MLIR_SRC_ROOT}/third_party/onnx + ${ONNX_MLIR_SRC_ROOT}/third_party/variant + ${ONNX_MLIR_SRC_ROOT}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1fccb7c..697aaa4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -26,7 +26,8 @@ whole_archive_link_mlir(onnx-mlir find_package(ZLIB REQUIRED) target_link_libraries(onnx-mlir ${ZLIB_LIBRARIES}) -target_include_directories(onnx-mlir PRIVATE ${CMAKE_SOURCE_DIR}) +target_include_directories(onnx-mlir PRIVATE ${ONNX_MLIR_SRC_ROOT}) target_include_directories(onnx-mlir PRIVATE ${CMAKE_BINARY_DIR}) +target_include_directories(onnx-mlir PRIVATE ${ONNX_MLIR_BIN_ROOT}) install(TARGETS onnx-mlir DESTINATION bin) diff --git a/src/Dialect/ONNX/CMakeLists.txt b/src/Dialect/ONNX/CMakeLists.txt index fbe1948..2d25210 100644 --- a/src/Dialect/ONNX/CMakeLists.txt +++ b/src/Dialect/ONNX/CMakeLists.txt @@ -1,6 +1,6 @@ set(LLVM_TARGET_DEFINITIONS ONNXOps.td) -onnx_mlir_tablegen(ONNXOps.hpp.inc -gen-op-decls "-I${CMAKE_SOURCE_DIR}/compiler/pass") -onnx_mlir_tablegen(ONNXOps.cpp.inc -gen-op-defs "-I${CMAKE_SOURCE_DIR}/compiler/pass") +onnx_mlir_tablegen(ONNXOps.hpp.inc -gen-op-decls "-I${ONNX_MLIR_SRC_ROOT}/compiler/pass") +onnx_mlir_tablegen(ONNXOps.cpp.inc -gen-op-defs "-I${ONNX_MLIR_SRC_ROOT}/compiler/pass") set(GEN_DOC_FILE ${CMAKE_BINARY_DIR}/docs/Dialects/onnx.md) add_public_tablegen_target(OMONNXOpsIncGen) @@ -17,4 +17,4 @@ target_link_libraries(OMONNXOps OMPromotableConstOperandsOpInterface OMShapeInferenceOpInterface) -add_onnx_mlir_dialect_doc(onnx ONNXOps.td) \ No newline at end of file +add_onnx_mlir_dialect_doc(onnx ONNXOps.td)