diff --git a/compiler/include/concretelang/Conversion/CMakeLists.txt b/compiler/include/concretelang/Conversion/CMakeLists.txt index 11585b9d9..2d29494b1 100644 --- a/compiler/include/concretelang/Conversion/CMakeLists.txt +++ b/compiler/include/concretelang/Conversion/CMakeLists.txt @@ -1,7 +1,7 @@ set(LLVM_TARGET_DEFINITIONS Passes.td) mlir_tablegen(Passes.h.inc -gen-pass-decls -name Conversion) add_public_tablegen_target(ConcretelangConversionPassIncGen) - +add_dependencies(mlir-headers ConcretelangConversionPassIncGen) add_subdirectory(FHEToTFHE) add_subdirectory(TFHEToConcrete) \ No newline at end of file diff --git a/compiler/include/concretelang/Conversion/FHEToTFHE/CMakeLists.txt b/compiler/include/concretelang/Conversion/FHEToTFHE/CMakeLists.txt index df6ef1a5f..7a2028e63 100644 --- a/compiler/include/concretelang/Conversion/FHEToTFHE/CMakeLists.txt +++ b/compiler/include/concretelang/Conversion/FHEToTFHE/CMakeLists.txt @@ -1,5 +1,6 @@ set(LLVM_TARGET_DEFINITIONS Patterns.td) mlir_tablegen(Patterns.h.inc -gen-rewriters -name FHE) add_public_tablegen_target(FHEToTFHEPatternsIncGen) +add_dependencies(mlir-headers FHEToTFHEPatternsIncGen) add_concretelang_doc(Patterns FHEToTFHEPatterns concretelang/ -gen-pass-doc) diff --git a/compiler/include/concretelang/Conversion/TFHEToConcrete/CMakeLists.txt b/compiler/include/concretelang/Conversion/TFHEToConcrete/CMakeLists.txt index 2adf2531e..89494e516 100644 --- a/compiler/include/concretelang/Conversion/TFHEToConcrete/CMakeLists.txt +++ b/compiler/include/concretelang/Conversion/TFHEToConcrete/CMakeLists.txt @@ -1,5 +1,6 @@ set(LLVM_TARGET_DEFINITIONS Patterns.td) mlir_tablegen(Patterns.h.inc -gen-rewriters -name TFHE) add_public_tablegen_target(TFHEToConcretePatternsIncGen) +add_dependencies(mlir-headers TFHEToConcretePatternsIncGen) add_concretelang_doc(Patterns TFHEToConcretePatterns concretelang/ -gen-pass-doc) diff --git a/compiler/include/concretelang/Dialect/FHE/Analysis/CMakeLists.txt b/compiler/include/concretelang/Dialect/FHE/Analysis/CMakeLists.txt index 85f5317dd..341e51e21 100644 --- a/compiler/include/concretelang/Dialect/FHE/Analysis/CMakeLists.txt +++ b/compiler/include/concretelang/Dialect/FHE/Analysis/CMakeLists.txt @@ -3,4 +3,4 @@ mlir_tablegen(MANP.h.inc -gen-pass-decls -name Analysis) mlir_tablegen(MANP.capi.h.inc -gen-pass-capi-header --prefix Analysis) mlir_tablegen(MANP.capi.cpp.inc -gen-pass-capi-impl --prefix Analysis) add_public_tablegen_target(MANPPassIncGen) - +add_dependencies(mlir-headers MANPPassIncGen) diff --git a/compiler/include/concretelang/Dialect/FHELinalg/Transforms/CMakeLists.txt b/compiler/include/concretelang/Dialect/FHELinalg/Transforms/CMakeLists.txt index 0eb4173a6..5c3e811ac 100644 --- a/compiler/include/concretelang/Dialect/FHELinalg/Transforms/CMakeLists.txt +++ b/compiler/include/concretelang/Dialect/FHELinalg/Transforms/CMakeLists.txt @@ -1,3 +1,4 @@ set(LLVM_TARGET_DEFINITIONS Tiling.td) mlir_tablegen(Tiling.h.inc -gen-pass-decls -name Transforms) add_public_tablegen_target(ConcretelangFHELinalgTilingPassIncGen) +add_dependencies(mlir-headers ConcretelangFHELinalgTilingPassIncGen) diff --git a/compiler/include/concretelang/Dialect/RT/Analysis/CMakeLists.txt b/compiler/include/concretelang/Dialect/RT/Analysis/CMakeLists.txt index 8b3423d9e..48fd0e23a 100644 --- a/compiler/include/concretelang/Dialect/RT/Analysis/CMakeLists.txt +++ b/compiler/include/concretelang/Dialect/RT/Analysis/CMakeLists.txt @@ -3,4 +3,4 @@ mlir_tablegen(Autopar.h.inc -gen-pass-decls -name Analysis) mlir_tablegen(Autopar.capi.h.inc -gen-pass-capi-header --prefix Analysis) mlir_tablegen(Autopar.capi.cpp.inc -gen-pass-capi-impl --prefix Analysis) add_public_tablegen_target(AutoparPassIncGen) - +add_dependencies(mlir-headers AutoparPassIncGen) diff --git a/compiler/include/concretelang/Transforms/CMakeLists.txt b/compiler/include/concretelang/Transforms/CMakeLists.txt index d93f30a0d..e7d6628f3 100644 --- a/compiler/include/concretelang/Transforms/CMakeLists.txt +++ b/compiler/include/concretelang/Transforms/CMakeLists.txt @@ -1,3 +1,4 @@ set(LLVM_TARGET_DEFINITIONS Bufferize.td) mlir_tablegen(Bufferize.h.inc -gen-pass-decls -name Transforms) add_public_tablegen_target(ConcretelangTransformsPassIncGen) +add_dependencies(mlir-headers ConcretelangTransformsPassIncGen) diff --git a/compiler/lib/CAPI/Dialect/FHE/CMakeLists.txt b/compiler/lib/CAPI/Dialect/FHE/CMakeLists.txt index 0728893fc..659b64876 100644 --- a/compiler/lib/CAPI/Dialect/FHE/CMakeLists.txt +++ b/compiler/lib/CAPI/Dialect/FHE/CMakeLists.txt @@ -4,6 +4,9 @@ add_mlir_public_c_api_library(CONCRETELANGCAPIFHE FHE.cpp + DEPENDS + mlir-headers + LINK_LIBS PUBLIC MLIRCAPIIR FHEDialect diff --git a/compiler/lib/CAPI/Dialect/FHELinalg/CMakeLists.txt b/compiler/lib/CAPI/Dialect/FHELinalg/CMakeLists.txt index 3219de675..58f45a20a 100644 --- a/compiler/lib/CAPI/Dialect/FHELinalg/CMakeLists.txt +++ b/compiler/lib/CAPI/Dialect/FHELinalg/CMakeLists.txt @@ -4,6 +4,9 @@ add_mlir_public_c_api_library(CONCRETELANGCAPIFHELINALG FHELinalg.cpp + DEPENDS + mlir-headers + LINK_LIBS PUBLIC MLIRCAPIIR FHELinalgDialect diff --git a/compiler/lib/Conversion/BConcreteToBConcreteCAPI/CMakeLists.txt b/compiler/lib/Conversion/BConcreteToBConcreteCAPI/CMakeLists.txt index 6b268598b..22876ab2b 100644 --- a/compiler/lib/Conversion/BConcreteToBConcreteCAPI/CMakeLists.txt +++ b/compiler/lib/Conversion/BConcreteToBConcreteCAPI/CMakeLists.txt @@ -6,7 +6,7 @@ add_mlir_dialect_library(BConcreteToBConcreteCAPI DEPENDS BConcreteDialect - ConcretelangConversionPassIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR diff --git a/compiler/lib/Conversion/ConcreteToBConcrete/CMakeLists.txt b/compiler/lib/Conversion/ConcreteToBConcrete/CMakeLists.txt index e641c64b4..88a6f218c 100644 --- a/compiler/lib/Conversion/ConcreteToBConcrete/CMakeLists.txt +++ b/compiler/lib/Conversion/ConcreteToBConcrete/CMakeLists.txt @@ -7,7 +7,7 @@ add_mlir_dialect_library(ConcreteToBConcrete DEPENDS ConcreteDialect BConcreteDialect - ConcretelangConversionPassIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR diff --git a/compiler/lib/Conversion/FHETensorOpsToLinalg/CMakeLists.txt b/compiler/lib/Conversion/FHETensorOpsToLinalg/CMakeLists.txt index 3fd284e8d..423b01bca 100644 --- a/compiler/lib/Conversion/FHETensorOpsToLinalg/CMakeLists.txt +++ b/compiler/lib/Conversion/FHETensorOpsToLinalg/CMakeLists.txt @@ -7,7 +7,7 @@ add_mlir_dialect_library(FHETensorOpsToLinalg DEPENDS FHEDialect FHELinalgDialect - ConcretelangConversionPassIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR diff --git a/compiler/lib/Conversion/FHEToTFHE/CMakeLists.txt b/compiler/lib/Conversion/FHEToTFHE/CMakeLists.txt index 67875a9a1..bf690ba11 100644 --- a/compiler/lib/Conversion/FHEToTFHE/CMakeLists.txt +++ b/compiler/lib/Conversion/FHEToTFHE/CMakeLists.txt @@ -6,8 +6,7 @@ add_mlir_dialect_library(FHEToTFHE DEPENDS FHEDialect - FHEToTFHEPatternsIncGen - ConcretelangConversionPassIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR diff --git a/compiler/lib/Conversion/MLIRLowerableDialectsToLLVM/CMakeLists.txt b/compiler/lib/Conversion/MLIRLowerableDialectsToLLVM/CMakeLists.txt index e89c46801..5d5922f7e 100644 --- a/compiler/lib/Conversion/MLIRLowerableDialectsToLLVM/CMakeLists.txt +++ b/compiler/lib/Conversion/MLIRLowerableDialectsToLLVM/CMakeLists.txt @@ -7,7 +7,7 @@ add_mlir_dialect_library(MLIRLowerableDialectsToLLVM ADDITIONAL_HEADER_DIRS DEPENDS - ConcretelangConversionPassIncGen + mlir-headers LINK_LIBS PUBLIC ${dialect_libs} diff --git a/compiler/lib/Conversion/TFHEGlobalParametrization/CMakeLists.txt b/compiler/lib/Conversion/TFHEGlobalParametrization/CMakeLists.txt index 82a664076..f47f7ffd4 100644 --- a/compiler/lib/Conversion/TFHEGlobalParametrization/CMakeLists.txt +++ b/compiler/lib/Conversion/TFHEGlobalParametrization/CMakeLists.txt @@ -6,7 +6,7 @@ TFHEGlobalParametrization.cpp DEPENDS TFHEDialect - ConcretelangConversionPassIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR diff --git a/compiler/lib/Conversion/TFHEToConcrete/CMakeLists.txt b/compiler/lib/Conversion/TFHEToConcrete/CMakeLists.txt index 80ddce88b..ce8f4440a 100644 --- a/compiler/lib/Conversion/TFHEToConcrete/CMakeLists.txt +++ b/compiler/lib/Conversion/TFHEToConcrete/CMakeLists.txt @@ -7,7 +7,7 @@ add_mlir_dialect_library(TFHEToConcrete DEPENDS TFHEDialect ConcreteDialect - TFHEToConcretePatternsIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR diff --git a/compiler/lib/Dialect/BConcrete/IR/CMakeLists.txt b/compiler/lib/Dialect/BConcrete/IR/CMakeLists.txt index c233fc380..257ecc7c3 100644 --- a/compiler/lib/Dialect/BConcrete/IR/CMakeLists.txt +++ b/compiler/lib/Dialect/BConcrete/IR/CMakeLists.txt @@ -6,7 +6,7 @@ add_mlir_dialect_library(BConcreteDialect ${PROJECT_SOURCE_DIR}/include/concretelang/Dialect/BConcrete DEPENDS - MLIRBConcreteOpsIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR) diff --git a/compiler/lib/Dialect/Concrete/IR/CMakeLists.txt b/compiler/lib/Dialect/Concrete/IR/CMakeLists.txt index 287bff284..c5e82aedf 100644 --- a/compiler/lib/Dialect/Concrete/IR/CMakeLists.txt +++ b/compiler/lib/Dialect/Concrete/IR/CMakeLists.txt @@ -6,7 +6,7 @@ add_mlir_dialect_library(ConcreteDialect ${PROJECT_SOURCE_DIR}/include/concretelang/Dialect/Concrete DEPENDS - MLIRConcreteOpsIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR) diff --git a/compiler/lib/Dialect/FHE/Analysis/CMakeLists.txt b/compiler/lib/Dialect/FHE/Analysis/CMakeLists.txt index ac50c758c..b512fded0 100644 --- a/compiler/lib/Dialect/FHE/Analysis/CMakeLists.txt +++ b/compiler/lib/Dialect/FHE/Analysis/CMakeLists.txt @@ -6,7 +6,7 @@ add_mlir_library(FHEDialectAnalysis DEPENDS FHEDialect - MANPPassIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR diff --git a/compiler/lib/Dialect/FHE/IR/CMakeLists.txt b/compiler/lib/Dialect/FHE/IR/CMakeLists.txt index 69cce21a8..1f4468393 100644 --- a/compiler/lib/Dialect/FHE/IR/CMakeLists.txt +++ b/compiler/lib/Dialect/FHE/IR/CMakeLists.txt @@ -6,7 +6,7 @@ add_mlir_dialect_library(FHEDialect ${PROJECT_SOURCE_DIR}/include/concretelang/Dialect/FHE DEPENDS - MLIRFHEOpsIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR) diff --git a/compiler/lib/Dialect/FHELinalg/IR/CMakeLists.txt b/compiler/lib/Dialect/FHELinalg/IR/CMakeLists.txt index d45647a4d..1c616ad7f 100644 --- a/compiler/lib/Dialect/FHELinalg/IR/CMakeLists.txt +++ b/compiler/lib/Dialect/FHELinalg/IR/CMakeLists.txt @@ -6,7 +6,7 @@ add_mlir_dialect_library(FHELinalgDialect ${PROJECT_SOURCE_DIR}/include/concretelang/Dialect/FHELinalg DEPENDS - MLIRFHELinalgOpsIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR) diff --git a/compiler/lib/Dialect/FHELinalg/Transforms/CMakeLists.txt b/compiler/lib/Dialect/FHELinalg/Transforms/CMakeLists.txt index 250a81e35..6bed3c8a2 100644 --- a/compiler/lib/Dialect/FHELinalg/Transforms/CMakeLists.txt +++ b/compiler/lib/Dialect/FHELinalg/Transforms/CMakeLists.txt @@ -6,7 +6,7 @@ add_mlir_library(FHELinalgDialectTransforms DEPENDS FHELinalgDialect - ConcretelangFHELinalgTilingPassIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR diff --git a/compiler/lib/Dialect/RT/Analysis/CMakeLists.txt b/compiler/lib/Dialect/RT/Analysis/CMakeLists.txt index dc0f4886f..67507a3b0 100644 --- a/compiler/lib/Dialect/RT/Analysis/CMakeLists.txt +++ b/compiler/lib/Dialect/RT/Analysis/CMakeLists.txt @@ -9,7 +9,7 @@ add_mlir_library(RTDialectAnalysis DEPENDS RTDialect - AutoparPassIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR diff --git a/compiler/lib/Dialect/RT/IR/CMakeLists.txt b/compiler/lib/Dialect/RT/IR/CMakeLists.txt index e42298fb8..fbf063f0d 100644 --- a/compiler/lib/Dialect/RT/IR/CMakeLists.txt +++ b/compiler/lib/Dialect/RT/IR/CMakeLists.txt @@ -6,7 +6,7 @@ add_mlir_dialect_library(RTDialect ${PROJECT_SOURCE_DIR}/include/concretelang/Dialect/RT DEPENDS - MLIRRTOpsIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR) diff --git a/compiler/lib/Dialect/TFHE/IR/CMakeLists.txt b/compiler/lib/Dialect/TFHE/IR/CMakeLists.txt index 205a742e5..bc894fce7 100644 --- a/compiler/lib/Dialect/TFHE/IR/CMakeLists.txt +++ b/compiler/lib/Dialect/TFHE/IR/CMakeLists.txt @@ -6,7 +6,7 @@ add_mlir_dialect_library(TFHEDialect ${PROJECT_SOURCE_DIR}/include/concretelang/Dialect/TFHE DEPENDS - MLIRTFHEOpsIncGen + mlir-headers LINK_LIBS PUBLIC MLIRIR) diff --git a/compiler/lib/Support/CMakeLists.txt b/compiler/lib/Support/CMakeLists.txt index 3fef1ca57..3a5be6781 100644 --- a/compiler/lib/Support/CMakeLists.txt +++ b/compiler/lib/Support/CMakeLists.txt @@ -15,7 +15,7 @@ add_mlir_library(ConcretelangSupport ${PROJECT_SOURCE_DIR}/include/concretelang/Support DEPENDS - MLIRConversionPassIncGen + mlir-headers LINK_LIBS PUBLIC FHELinalgDialect diff --git a/compiler/lib/Transforms/CMakeLists.txt b/compiler/lib/Transforms/CMakeLists.txt index 5606bdd55..2e9eccf0c 100644 --- a/compiler/lib/Transforms/CMakeLists.txt +++ b/compiler/lib/Transforms/CMakeLists.txt @@ -6,7 +6,7 @@ add_mlir_library(ConcretelangTransforms DEPENDS MLIRTransforms - ConcretelangTransformsPassIncGen + mlir-headers LINK_LIBS PUBLIC MLIRMemRef diff --git a/compiler/src/CMakeLists.txt b/compiler/src/CMakeLists.txt index 10e6821db..73bda1b45 100644 --- a/compiler/src/CMakeLists.txt +++ b/compiler/src/CMakeLists.txt @@ -5,6 +5,8 @@ llvm_update_compile_flags(concretecompiler) get_property(dialect_libs GLOBAL PROPERTY MLIR_DIALECT_LIBS) get_property(conversion_libs GLOBAL PROPERTY MLIR_CONVERSION_LIBS) +add_dependencies(concretecompiler mlir-headers) + if(CONCRETELANG_PARALLEL_EXECUTION_ENABLED) target_link_libraries(concretecompiler PRIVATE