Fix merge issues

Author: kurapov-peter

lib/gc/Dialect/LLVMIR/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_mlir_dialect_library(MLIRGENDialect
+gc_add_mlir_dialect_library(MLIRGENDialect
   IR/GENDialect.cpp
 
   ADDITIONAL_HEADER_DIRS
@@ -17,5 +17,4 @@ add_mlir_dialect_library(MLIRGENDialect
   MLIRLLVMDialect
   MLIRSideEffectInterfaces
   GcInterface
-  )
-set_property(GLOBAL APPEND PROPERTY GC_DIALECT_LIBS MLIRGENDialect)
+)

src/gc-opt/gc-opt.cpp

@@ -75,7 +75,7 @@ int main(int argc, char *argv[]) {
   mlir::registerAllToLLVMIRTranslations(registry);
   mlir::gen::registerGenTargetInterfaceExternalModels(registry);
   mlir::registerGENDialectTranslation(registry);
-#ifdef GC_USE_GPU
+#ifdef GC_USE_IMEX
   registry.insert<::imex::xetile::XeTileDialect, ::imex::gpux::GPUXDialect>();
 #endif
   mlir::cpuruntime::registerConvertCPURuntimeToLLVMInterface(registry);