From 6d03b2798b66fa5ae3bf1b8bdf159e168ef63ce3 Mon Sep 17 00:00:00 2001 From: Julien Schueller Date: Thu, 29 Feb 2024 11:47:34 +0100 Subject: [PATCH] OMCompiler: Relocatable compilation tools (#12039) --- OMCompiler/Compiler/Script/CevalScriptBackend.mo | 4 ++-- OMCompiler/Compiler/Util/Autoconf.mo.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OMCompiler/Compiler/Script/CevalScriptBackend.mo b/OMCompiler/Compiler/Script/CevalScriptBackend.mo index 018a3ee2bf6..ac5913a16e3 100644 --- a/OMCompiler/Compiler/Script/CevalScriptBackend.mo +++ b/OMCompiler/Compiler/Script/CevalScriptBackend.mo @@ -3509,8 +3509,8 @@ algorithm fmuSourceDir := fmutmp+"/sources/"; quote := "'"; dquote := if isWindows then "\"" else "'"; - CC := "-DCMAKE_C_COMPILER=" + dquote + makefileParams.ccompiler + dquote; - CXX := "-DCMAKE_CXX_COMPILER=" + dquote + makefileParams.cxxcompiler + dquote; + CC := "-DCMAKE_C_COMPILER=" + dquote + System.basename(makefileParams.ccompiler) + dquote; + CXX := "-DCMAKE_CXX_COMPILER=" + dquote + System.basename(makefileParams.cxxcompiler) + dquote; defaultFmiIncludeDirectoy := dquote + Settings.getInstallationDirectoryPath() + "/include/omc/c/fmi" + dquote; // Set build type diff --git a/OMCompiler/Compiler/Util/Autoconf.mo.in b/OMCompiler/Compiler/Util/Autoconf.mo.in index dcc21ff8bdd..e7e6ec0176a 100644 --- a/OMCompiler/Compiler/Util/Autoconf.mo.in +++ b/OMCompiler/Compiler/Util/Autoconf.mo.in @@ -9,7 +9,7 @@ encapsulated package Autoconf constant String platform = if isWindows and is64Bit then "WIN64" elseif isWindows then "WIN32" else "Unix"; constant String make = "@OMC_MAKE_EXE@"; - constant String cmake = "\"@OMC_CMAKE_EXE@\""; + constant String cmake = "cmake"; constant String exeExt = if isWindows then ".exe" else ""; constant String dllExt = "@SHREXT@";