Merge pull request #1622 from lf-lang/cmake-cleanup

Do not hardcode compile definitions in generated CMakeLists.txt
lf-lang · Mar 12, 2023 · b0e3a70 · b0e3a70
2 parents f90dd16 + 17dc4ab
commit b0e3a70
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
diff --git a/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java b/org.lflang/src/org/lflang/generator/c/CCmakeGenerator.java
@@ -194,11 +194,6 @@ CodeBuilder generateCMakeCode(
         if (targetConfig.platformOptions.platform != Platform.AUTO) {
             cMakeCode.pr("set(CMAKE_SYSTEM_NAME "+targetConfig.platformOptions.platform.getcMakeName()+")");
         }
-
-        cMakeCode.pr("# Target definitions\n");
-        targetConfig.compileDefinitions.forEach((key, value) -> cMakeCode.pr(
-            "add_compile_definitions("+key+"="+value+")\n"
-        ));
         cMakeCode.newLine();
 
         if (targetConfig.platformOptions.platform == Platform.ZEPHYR) {
+2 −1		core/CMakeLists.txt
+1 −0		core/federated/RTI/CMakeLists.txt
+2 −2,245		core/federated/RTI/rti.c
+0 −204		core/federated/RTI/rti.h
+2,260 −0		core/federated/RTI/rti_lib.c
+654 −0		core/federated/RTI/rti_lib.h
+1 −0		core/reactor.c
+1 −0		core/reactor_common.c
+1 −0		core/threaded/reactor_threaded.c
+9 −0		core/trace.c
+12 −0		include/core/trace.h