From 3d7eacd9db588fb930957e1a48c2314d7d7e24c7 Mon Sep 17 00:00:00 2001 From: Stephen Neuendorffer Date: Thu, 4 Jan 2024 14:37:04 -0800 Subject: [PATCH] Fixup MLIR target export in AIEConfig.cmake MLIR_CONFIG_INCLUDE_EXPORTS_FILE was not generated for a build directory, which caused errors when this was being used. --- cmake/modules/CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt index a71bf515be..aca384d352 100644 --- a/cmake/modules/CMakeLists.txt +++ b/cmake/modules/CMakeLists.txt @@ -22,6 +22,7 @@ set(AIE_CONFIG_TOOLS_BINARY_DIR "${PROJECT_BINARY_DIR}/bin") set(AIE_CONFIG_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/include") set(AIE_CONFIG_EXPORTS_FILE "\${AIE_CMAKE_DIR}/AIETargets.cmake") +set(MLIR_CONFIG_INCLUDE_EXPORTS_FILE "\${MLIR_DIR}/MLIRTargets.cmake") set(AIE_CONFIG_LibXAIE_x86_64_DIR) if("x86_64" IN_LIST AIE_RUNTIME_TARGETS) set(AIE_CONFIG_LibXAIE_x86_64_DIR @@ -59,7 +60,7 @@ set(AIE_CONFIG_BINARY_DIR "\${AIE_INSTALL_PREFIX}") set(AIE_CONFIG_TOOLS_BINARY_DIR "\${AIE_INSTALL_PREFIX}/bin") set(AIE_CONFIG_INCLUDE_DIRS "\${AIE_INSTALL_PREFIX}/include") set(AIE_CONFIG_EXPORTS_FILE "\${AIE_CMAKE_DIR}/AIETargets.cmake") -set(MLIR_CONFIG_INCLUDE_EXPORTS_FILE "\${AIE_CMAKE_DIR}/MLIRTargets.cmake") +set(MLIR_CONFIG_INCLUDE_EXPORTS_FILE "\${MLIR_DIR}/MLIRTargets.cmake") set(AIE_CONFIG_LibXAIE_x86_64_DIR) if("x86_64" IN_LIST AIE_RUNTIME_TARGETS) set(AIE_CONFIG_LibXAIE_x86_64_DIR @@ -87,10 +88,6 @@ install( EXPORT AIETargets DESTINATION ${AIE_INSTALL_PACKAGE_DIR} COMPONENT aie-cmake-exports) -install( - EXPORT MLIRTargets - DESTINATION ${AIE_INSTALL_PACKAGE_DIR} - COMPONENT aie-cmake-exports) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/AIEConfig.cmake DESTINATION ${AIE_INSTALL_PACKAGE_DIR}