[PATCH] D75299: [mlir] Fix cross compiling MLIR

[Mehdi Amini via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rG103678d66a9e: [mlir] Fix cross compiling MLIR (authored by isuruf, committed by joker-eph-DISABLED).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D75299?vs=247086&id=250377#toc

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D75299/new/

https://reviews.llvm.org/D75299

Files:
  mlir/CMakeLists.txt
  mlir/tools/CMakeLists.txt


Index: mlir/tools/CMakeLists.txt
===================================================================
--- mlir/tools/CMakeLists.txt
+++ mlir/tools/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_subdirectory(mlir-cuda-runner)
 add_subdirectory(mlir-cpu-runner)
 add_subdirectory(mlir-opt)
-add_subdirectory(mlir-tblgen)
 add_subdirectory(mlir-translate)
 add_subdirectory(mlir-vulkan-runner)
 add_subdirectory(mlir-shlib)
Index: mlir/CMakeLists.txt
===================================================================
--- mlir/CMakeLists.txt
+++ mlir/CMakeLists.txt
@@ -1,7 +1,6 @@
 # MLIR project.
 set(MLIR_MAIN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include ) # --src-root
 set(MLIR_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include ) # --includedir
-set(MLIR_TABLEGEN_EXE mlir-tblgen)
 
 set(MLIR_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(MLIR_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
@@ -32,6 +31,11 @@
 include_directories( "include")
 include_directories( ${MLIR_INCLUDE_DIR})
 
+# Adding tools/mlir-tblgen here as calling add_tablegen sets some variables like
+# MLIR_TABLEGEN_EXE in PARENT_SCOPE which gets lost if that folder is included
+# from another directory like tools
+add_subdirectory(tools/mlir-tblgen)
+
 add_subdirectory(include/mlir)
 add_subdirectory(lib)
 add_subdirectory(unittests)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D75299.250377.patch
Type: text/x-patch
Size: 1291 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200314/9138e523/attachment.bin>