[Mlir-commits] [mlir] 95201fc - Revert "[mlir][cmake] Don't add dependencies on mlir-(generic-)headers"

[Mehdi Amini]

Author: Mehdi Amini
Date: 2022-09-03T01:45:18Z
New Revision: 95201fcca0d452757da5b25f431e998f46eecd48

URL: https://github.com/llvm/llvm-project/commit/95201fcca0d452757da5b25f431e998f46eecd48
DIFF: https://github.com/llvm/llvm-project/commit/95201fcca0d452757da5b25f431e998f46eecd48.diff

LOG: Revert "[mlir][cmake] Don't add dependencies on mlir-(generic-)headers"

This reverts commit 7691b69d5b2f5e9d8b210add22926335b3541444.

Bots are broken because we're missing CMake dependencies all around now.

Added: 
    

Modified: 
    mlir/cmake/modules/AddMLIR.cmake
    mlir/lib/Analysis/CMakeLists.txt
    mlir/lib/Dialect/Transform/IR/CMakeLists.txt
    mlir/lib/Pass/CMakeLists.txt
    mlir/lib/Rewrite/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/mlir/cmake/modules/AddMLIR.cmake b/mlir/cmake/modules/AddMLIR.cmake
index dbcc13aea781..15079eea3009 100644
--- a/mlir/cmake/modules/AddMLIR.cmake
+++ b/mlir/cmake/modules/AddMLIR.cmake
@@ -577,19 +577,19 @@ endfunction()
 # Declare the library associated with a dialect.
 function(add_mlir_dialect_library name)
   set_property(GLOBAL APPEND PROPERTY MLIR_DIALECT_LIBS ${name})
-  add_mlir_library(${ARGV})
+  add_mlir_library(${ARGV} DEPENDS mlir-headers)
 endfunction(add_mlir_dialect_library)
 
 # Declare the library associated with a conversion.
 function(add_mlir_conversion_library name)
   set_property(GLOBAL APPEND PROPERTY MLIR_CONVERSION_LIBS ${name})
-  add_mlir_library(${ARGV})
+  add_mlir_library(${ARGV} DEPENDS mlir-headers)
 endfunction(add_mlir_conversion_library)
 
 # Declare the library associated with a translation.
 function(add_mlir_translation_library name)
   set_property(GLOBAL APPEND PROPERTY MLIR_TRANSLATION_LIBS ${name})
-  add_mlir_library(${ARGV})
+  add_mlir_library(${ARGV} DEPENDS mlir-headers)
 endfunction(add_mlir_translation_library)
 
 # Verification tools to aid debugging.

diff  --git a/mlir/lib/Analysis/CMakeLists.txt b/mlir/lib/Analysis/CMakeLists.txt
index 6b75bacd449a..23bcb97b6a2e 100644
--- a/mlir/lib/Analysis/CMakeLists.txt
+++ b/mlir/lib/Analysis/CMakeLists.txt
@@ -34,6 +34,9 @@ add_mlir_library(MLIRAnalysis
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Analysis
 
+  DEPENDS
+  mlir-headers
+
   LINK_LIBS PUBLIC
   MLIRCallInterfaces
   MLIRControlFlowInterfaces

diff  --git a/mlir/lib/Dialect/Transform/IR/CMakeLists.txt b/mlir/lib/Dialect/Transform/IR/CMakeLists.txt
index e770dc1ebd9c..3041d20a87c4 100644
--- a/mlir/lib/Dialect/Transform/IR/CMakeLists.txt
+++ b/mlir/lib/Dialect/Transform/IR/CMakeLists.txt
@@ -6,7 +6,6 @@ add_mlir_dialect_library(MLIRTransformDialect
   DEPENDS
   MLIRTransformDialectIncGen
   MLIRTransformInterfacesIncGen
-  MLIRTransformOpsIncGen
 
   LINK_LIBS PUBLIC
   MLIRIR

diff  --git a/mlir/lib/Pass/CMakeLists.txt b/mlir/lib/Pass/CMakeLists.txt
index 76ed4a48e200..5ca9b4163bb8 100644
--- a/mlir/lib/Pass/CMakeLists.txt
+++ b/mlir/lib/Pass/CMakeLists.txt
@@ -10,6 +10,9 @@ add_mlir_library(MLIRPass
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Pass
 
+  DEPENDS
+  mlir-generic-headers
+
   LINK_LIBS PUBLIC
   MLIRAnalysis
   MLIRIR

diff  --git a/mlir/lib/Rewrite/CMakeLists.txt b/mlir/lib/Rewrite/CMakeLists.txt
index 03afe409adf6..e0395be6cd6f 100644
--- a/mlir/lib/Rewrite/CMakeLists.txt
+++ b/mlir/lib/Rewrite/CMakeLists.txt
@@ -6,6 +6,9 @@ add_mlir_library(MLIRRewrite
   ADDITIONAL_HEADER_DIRS
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/Rewrite
 
+  DEPENDS
+  mlir-generic-headers
+
   LINK_LIBS PUBLIC
   MLIRIR
   MLIRPDLDialect