Fix CMake build: account for renamed files and add missing include on MacOS

--

PiperOrigin-RevId: 242101364

mlir/examples/toy/Ch4/CMakeLists.txt

@@ -0,0 +1,21 @@
+set(LLVM_LINK_COMPONENTS
+  Support
+  )
+
+add_toy_chapter(toyc-ch4
+  toyc.cpp
+  parser/AST.cpp
+  mlir/MLIRGen.cpp
+  mlir/ToyDialect.cpp
+  mlir/ShapeInferencePass.cpp
+  mlir/ToyCombine.cpp
+  )
+include_directories(include/)
+target_link_libraries(toyc-ch4
+  PRIVATE
+    MLIRAnalysis
+    MLIRIR
+    MLIRParser
+    MLIRPass
+    MLIRTransforms)
+

mlir/examples/toy/Ch4/mlir/ToyCombine.cpp

@@ -26,6 +26,8 @@
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/IR/StandardTypes.h"
 
+#include <numeric>
+
 namespace toy {
 
 namespace {

mlir/lib/Transforms/CMakeLists.txt

@@ -1,7 +1,6 @@
 add_llvm_library(MLIRTransforms
   Canonicalizer.cpp
   CMakeLists.txt
-  ConstantFold.cpp
   CSE.cpp
   DialectConversion.cpp
   DmaGeneration.cpp
@@ -16,6 +15,7 @@ add_llvm_library(MLIRTransforms
   PipelineDataTransfer.cpp
   SimplifyAffineStructures.cpp
   StripDebugInfo.cpp
+  TestConstantFold.cpp
   Utils/GreedyPatternRewriteDriver.cpp
   Utils/LoopUtils.cpp
   Utils/Utils.cpp