[gnome-builder] cmake: allow specifying CMAKE environment variable



commit daacb56ee9edb9463ded038290343fc9918b2fdb
Author: Christian Hergert <chergert redhat com>
Date:   Wed Jan 17 14:51:57 2018 -0800

    cmake: allow specifying CMAKE environment variable
    
    This allows the user to specify CMAKE=/path/to/cmake in case they need to
    use an alternate cmake than the default cmake in $PATH.

 src/plugins/cmake/gbp-cmake-pipeline-addin.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/src/plugins/cmake/gbp-cmake-pipeline-addin.c b/src/plugins/cmake/gbp-cmake-pipeline-addin.c
index 8dc41d561..f9a88c1d5 100644
--- a/src/plugins/cmake/gbp-cmake-pipeline-addin.c
+++ b/src/plugins/cmake/gbp-cmake-pipeline-addin.c
@@ -82,6 +82,7 @@ gbp_cmake_pipeline_addin_load (IdeBuildPipelineAddin *addin,
   const gchar *config_opts;
   const gchar *prefix;
   const gchar *srcdir;
+  const gchar *cmake;
   guint id;
   gint parallelism;
 
@@ -104,6 +105,9 @@ gbp_cmake_pipeline_addin_load (IdeBuildPipelineAddin *addin,
   g_assert (IDE_IS_RUNTIME (runtime));
   g_assert (srcdir != NULL);
 
+  if (!(cmake = ide_configuration_getenv (configuration, "CMAKE")))
+    cmake = "cmake";
+
   for (guint i = 0; i < G_N_ELEMENTS (ninja_names); i++)
     {
       if (ide_runtime_contains_program_in_path (runtime, ninja_names[i], NULL))
@@ -133,7 +137,7 @@ gbp_cmake_pipeline_addin_load (IdeBuildPipelineAddin *addin,
 
   prefix_option = g_strdup_printf ("-DCMAKE_INSTALL_PREFIX=%s", prefix);
 
-  ide_subprocess_launcher_push_argv (configure_launcher, "cmake");
+  ide_subprocess_launcher_push_argv (configure_launcher, cmake);
   ide_subprocess_launcher_push_argv (configure_launcher, "-G");
   ide_subprocess_launcher_push_argv (configure_launcher, "Ninja");
   ide_subprocess_launcher_push_argv (configure_launcher, ".");


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]