From: Lei Zhang <antiagainst@google.com>
Date: Thu, 11 Apr 2019 19:34:50 +0000 (-0700)
Subject:     Add missing dependencies for EDSC and linalg libraries
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0836f670f1626119bbdb97683eede29405bb40e0;p=platform%2Fupstream%2Fllvm.git

Add missing dependencies for EDSC and linalg libraries

    This solves the missing "mlir/StandardOps/Ops.h.inc" issue when building
    a fresh checkout on macOS.

--

PiperOrigin-RevId: 243120388
---

diff --git a/mlir/examples/Linalg/Linalg1/CMakeLists.txt b/mlir/examples/Linalg/Linalg1/CMakeLists.txt
index 99f2362..8556c6f 100644
--- a/mlir/examples/Linalg/Linalg1/CMakeLists.txt
+++ b/mlir/examples/Linalg/Linalg1/CMakeLists.txt
@@ -19,14 +19,6 @@ target_link_libraries(linalg-example-1
   PRIVATE
     Linalg1DialectConstruction
     Linalg1
-    MLIRAnalysis
-    MLIRDialect
-    MLIREDSC
-    MLIRIR
-    MLIRLLVMIR
-    MLIRParser
-    MLIRPass
-    MLIRTransforms
     )
 
 whole_archive_link(linalg-example-1
@@ -37,14 +29,6 @@ target_link_libraries(linalg-conversion-1
   PRIVATE
     Linalg1DialectConstruction
     Linalg1
-    MLIRAnalysis
-    MLIRDialect
-    MLIREDSC
-    MLIRIR
-    MLIRLLVMIR
-    MLIRParser
-    MLIRPass
-    MLIRTransforms
     )
 
 whole_archive_link(linalg-conversion-1
diff --git a/mlir/examples/Linalg/Linalg1/lib/CMakeLists.txt b/mlir/examples/Linalg/Linalg1/lib/CMakeLists.txt
index 6b814b5..3722701 100644
--- a/mlir/examples/Linalg/Linalg1/lib/CMakeLists.txt
+++ b/mlir/examples/Linalg/Linalg1/lib/CMakeLists.txt
@@ -23,6 +23,21 @@ add_llvm_library(Linalg1
   ViewType.cpp
   )
 
+target_link_libraries(Linalg1
+  PUBLIC
+    MLIRAnalysis
+    MLIRDialect
+    MLIREDSC
+    MLIRIR
+    MLIRLLVMIR
+    MLIRParser
+    MLIRPass
+    MLIRTransforms
+    )
+
 add_llvm_library(Linalg1DialectConstruction
   DialectConstruction.cpp
   )
+
+target_link_libraries(Linalg1DialectConstruction
+  PUBLIC Linalg1)
diff --git a/mlir/examples/Linalg/Linalg2/CMakeLists.txt b/mlir/examples/Linalg/Linalg2/CMakeLists.txt
index d31f727..b6c2043 100644
--- a/mlir/examples/Linalg/Linalg2/CMakeLists.txt
+++ b/mlir/examples/Linalg/Linalg2/CMakeLists.txt
@@ -13,14 +13,6 @@ add_llvm_example(linalg-example-2
 
 target_link_libraries(linalg-example-2
   PRIVATE
-    MLIRAnalysis
-    MLIRDialect
-    MLIREDSC
-    MLIRIR
-    MLIRLLVMIR
-    MLIRParser
-    MLIRPass
-    MLIRTransforms
     Linalg1
     Linalg2
     Linalg2DialectConstruction
diff --git a/mlir/examples/Linalg/Linalg2/lib/CMakeLists.txt b/mlir/examples/Linalg/Linalg2/lib/CMakeLists.txt
index a8976ef..79546a8 100644
--- a/mlir/examples/Linalg/Linalg2/lib/CMakeLists.txt
+++ b/mlir/examples/Linalg/Linalg2/lib/CMakeLists.txt
@@ -9,6 +9,21 @@ add_llvm_library(Linalg2
   Transforms.cpp
   )
 
+target_link_libraries(Linalg2
+  PUBLIC
+    MLIRAnalysis
+    MLIRDialect
+    MLIREDSC
+    MLIRIR
+    MLIRLLVMIR
+    MLIRParser
+    MLIRPass
+    MLIRTransforms
+    )
+
 add_llvm_library(Linalg2DialectConstruction
   DialectConstruction.cpp
   )
+
+target_link_libraries(Linalg2DialectConstruction
+  PUBLIC Linalg2)
diff --git a/mlir/examples/Linalg/Linalg3/CMakeLists.txt b/mlir/examples/Linalg/Linalg3/CMakeLists.txt
index e3d5d94..4c6da82 100644
--- a/mlir/examples/Linalg/Linalg3/CMakeLists.txt
+++ b/mlir/examples/Linalg/Linalg3/CMakeLists.txt
@@ -29,14 +29,6 @@ add_llvm_example(linalg-execution-3
 
 target_link_libraries(linalg-example-3
   PRIVATE
-    MLIRAnalysis
-    MLIRDialect
-    MLIREDSC
-    MLIRIR
-    MLIRLLVMIR
-    MLIRParser
-    MLIRPass
-    MLIRTransforms
     Linalg1
     Linalg2
     Linalg3
@@ -49,14 +41,6 @@ whole_archive_link(linalg-example-3
 
 target_link_libraries(linalg-conversion-3
   PRIVATE
-    MLIRAnalysis
-    MLIRDialect
-    MLIREDSC
-    MLIRIR
-    MLIRLLVMIR
-    MLIRParser
-    MLIRPass
-    MLIRTransforms
     Linalg1
     Linalg2
     Linalg3
@@ -69,17 +53,7 @@ whole_archive_link(linalg-conversion-3
 
 target_link_libraries(linalg-execution-3
   PRIVATE
-    MLIRAnalysis
-    MLIRDialect
-    MLIREDSC
     MLIRExecutionEngine
-    MLIRIR
-    MLIRLLVMIR
-    MLIRParser
-    MLIRPass
-    MLIRSupport
-    MLIRTargetLLVMIR
-    MLIRTransforms
     Linalg1
     Linalg2
     Linalg3
diff --git a/mlir/examples/Linalg/Linalg3/lib/CMakeLists.txt b/mlir/examples/Linalg/Linalg3/lib/CMakeLists.txt
index 4055b7a..f87cbca 100644
--- a/mlir/examples/Linalg/Linalg3/lib/CMakeLists.txt
+++ b/mlir/examples/Linalg/Linalg3/lib/CMakeLists.txt
@@ -15,6 +15,21 @@ add_llvm_library(Linalg3
   TensorOps.cpp
   )
 
+target_link_libraries(Linalg3
+  PUBLIC
+    MLIRAnalysis
+    MLIRDialect
+    MLIREDSC
+    MLIRIR
+    MLIRLLVMIR
+    MLIRParser
+    MLIRPass
+    MLIRTransforms
+    )
+
 add_llvm_library(Linalg3DialectConstruction
   DialectConstruction.cpp
   )
+
+target_link_libraries(Linalg3DialectConstruction
+  PUBLIC Linalg3)
diff --git a/mlir/examples/Linalg/Linalg4/lib/CMakeLists.txt b/mlir/examples/Linalg/Linalg4/lib/CMakeLists.txt
index dac8b35..523050f 100644
--- a/mlir/examples/Linalg/Linalg4/lib/CMakeLists.txt
+++ b/mlir/examples/Linalg/Linalg4/lib/CMakeLists.txt
@@ -1,3 +1,15 @@
 add_llvm_library(Linalg4
   Transforms.cpp
   )
+
+target_link_libraries(Linalg4
+  PUBLIC
+    MLIRAnalysis
+    MLIRDialect
+    MLIREDSC
+    MLIRIR
+    MLIRLLVMIR
+    MLIRParser
+    MLIRPass
+    MLIRTransforms
+    )
diff --git a/mlir/lib/EDSC/CMakeLists.txt b/mlir/lib/EDSC/CMakeLists.txt
index aa60bfa..23feceb 100644
--- a/mlir/lib/EDSC/CMakeLists.txt
+++ b/mlir/lib/EDSC/CMakeLists.txt
@@ -8,3 +8,9 @@ add_llvm_library(MLIREDSC
   ${MLIR_MAIN_INCLUDE_DIR}/mlir/EDSC
   )
 add_dependencies(MLIREDSC MLIRReferenceImplementationTestGen)
+target_link_libraries(MLIREDSC
+  PUBLIC
+    MLIRAffineOps
+    MLIRStandardOps
+    MLIRVectorOps
+    )