OMCompiler: Relocatable compilation tools (#12039)

OpenModelica · Feb 29, 2024 · 6d03b27 · 6d03b27
1 parent c9f5345
commit 6d03b27
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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@";