From 436ca39fdae911501ff3ab3fae6d3db371ddaa82 Mon Sep 17 00:00:00 2001 From: erlingrj Date: Fri, 24 Jan 2025 11:25:52 +0100 Subject: [PATCH] Dont put LF_FILE_SEPARATOR in CMakeLists.txt --- .../java/org/lflang/federated/extensions/CExtensionUtils.java | 1 + core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java index 541ff67f74..ad982431a2 100644 --- a/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java +++ b/core/src/main/java/org/lflang/federated/extensions/CExtensionUtils.java @@ -313,6 +313,7 @@ public static void generateCMakeInclude( "add_compile_definitions(LF_PACKAGE_DIRECTORY=\"" + fileConfig.srcPkgPath + "\")"); cmakeIncludeCode.pr( "add_compile_definitions(LF_SOURCE_GEN_DIRECTORY=\"" + fileConfig.getSrcGenPath() + "\")"); + cmakeIncludeCode.pr("add_compile_definitions(LF_FILE_SEPARATOR=\"" + File.separator + "\")"); try (var srcWriter = Files.newBufferedWriter(cmakeIncludePath)) { srcWriter.write(cmakeIncludeCode.getCode()); } diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java index 283da8257f..c9420d2a00 100644 --- a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java +++ b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java @@ -333,8 +333,6 @@ CodeBuilder generateCMakeCode( } cMakeCode.pr("set(" + key + " " + v + " CACHE STRING \"\")\n"); }); - // Set default values for various build paths - cMakeCode.pr("set(LF_FILE_SEPARATOR=\"" + File.separator + "\" CACHE STRING \"\")"); // Add trace-plugin data var tracePlugin = targetConfig.getOrDefault(TracePluginProperty.INSTANCE); System.out.println(tracePlugin);