fix: consider build presets

Author: Civitasv

lua/cmake-tools/build_preset.lua

@@ -0,0 +1,24 @@
+local Path = require("plenary.path")
+local osys = require("cmake-tools.osys")
+
+local BuildPreset = {}
+
+function BuildPreset:new(cwd, obj)
+  local instance = setmetatable(obj or {}, { __index = self })
+  instance.__index = self
+  instance.environment = instance.environment or {}
+  instance.cwd = cwd
+
+  return instance
+end
+
+function BuildPreset:get_build_target()
+  if type(self.targets) == "string" then
+    return self.targets
+  elseif type(self.targets == "table") then
+    return table.concat(self.targets, " ")
+  end
+  return ""
+end
+
+return BuildPreset

lua/cmake-tools/init.lua

@@ -115,6 +115,11 @@ function cmake.generate(opt, callback)
   if presets_exists then
     local presets = Presets:parse(config.cwd)
 
+    -- Refresh build type to use from CMakePresets
+    if config.configure_preset then
+      config.build_type = presets:get_configure_preset(config.configure_preset):get_build_type()
+    end
+
     if not config.configure_preset then
       -- try to determine the confiure preset based on the build preset
       if config.build_preset then
@@ -331,7 +336,34 @@ function cmake.build(opt, callback)
     end)
   end
 
-  if opt.target == nil and config.build_target == nil then
+  local presets_exists = config.base_settings.use_preset and Presets.exists(config.cwd)
+  if presets_exists then
+    local presets = Presets:parse(config.cwd)
+    if not config.build_preset then
+      return cmake.select_build_preset(function(result)
+        if not result:is_ok() then
+          callback(result)
+          return
+        end
+        cmake.generate({ bang = false, fargs = {} }, function(generate_result)
+          if not generate_result:is_ok() then
+            callback(generate_result)
+            return
+          end
+          cmake.build(opt, callback)
+        end)
+      end)
+    end
+    if config.build_preset then
+      local build_preset = presets:get_build_preset(config.build_preset)
+      if build_preset then
+        config.build_target = build_preset:get_build_target()
+      end
+    end
+  end
+
+  -- If presets exists, use build target from it
+  if presets_exists == false and opt.target == nil and config.build_target == nil then
     return cmake.select_build_target(true, function(result)
       if result:is_ok() then
         cmake.build(opt, callback)
@@ -342,7 +374,6 @@ function cmake.build(opt, callback)
   end
 
   local args
-  local presets_exists = config.base_settings.use_preset and Presets.exists(config.cwd)
 
   if presets_exists and config.build_preset then
     args = { "--build", "--preset", config.build_preset } -- preset don't need define build dir.
@@ -356,12 +387,9 @@ function cmake.build(opt, callback)
   if opt.target ~= nil then
     vim.list_extend(args, { "--target", opt.target })
     vim.list_extend(args, fargs)
-  elseif config.build_target == "all" then
+  elseif config.build_target ~= nil then
     vim.list_extend(args, { "--target", "all" })
     vim.list_extend(args, fargs)
-  else
-    vim.list_extend(args, { "--target", config.build_target })
-    vim.list_extend(args, fargs)
   end
 
   if config.build_type ~= nil then
@@ -837,6 +865,7 @@ function cmake.select_build_preset(callback)
         end
         if config.build_preset ~= choice then
           config.build_preset = choice
+          config.build_target = presets:get_build_preset(choice):get_build_target()
         end
         local associated_configure_preset = presets:get_configure_preset(
           presets:get_build_preset(choice).configurePreset,

lua/cmake-tools/preset.lua

@@ -255,7 +255,7 @@ local function parseTree(self, get_preset)
 end
 
 function Preset:new(cwd, obj, get_preset)
-  local instance = setmetatable(obj or {}, self)
+  local instance = setmetatable(obj or {}, { __index = self })
   instance.__index = self
   instance.environment = instance.environment or {}
   instance.cwd = cwd

lua/cmake-tools/presets.lua

@@ -1,5 +1,6 @@
 local Path = require("plenary.path")
 local Preset = require("cmake-tools.preset")
+local BuildPreset = require("cmake-tools.build_preset")
 
 -- Extends (or creates a new) key-value pair in [dest] in which the
 -- key is [key] and the value is the resulting list table of merging
@@ -105,6 +106,7 @@ function Presets:parse(cwd)
     end
   end
 
+  -- Instance extends self
   local instance = setmetatable(data, self)
   self.__index = self
 
@@ -115,10 +117,18 @@ function Presets:parse(cwd)
     return Preset:new(cwd, obj, getPreset)
   end
 
+  local function createBuildPreset(obj)
+    return BuildPreset:new(cwd, obj)
+  end
+
   for _, preset in ipairs(instance.configurePresets) do
     preset = createPreset(preset)
   end
 
+  for _, build_preset in ipairs(instance.buildPresets) do
+    build_preset = createBuildPreset(build_preset)
+  end
+
   return instance
 end
 
@@ -191,7 +201,7 @@ function Presets:get_configure_preset(name, opts)
 end
 
 function Presets:get_build_preset(name, opts)
-  return get_preset(name, self.buildPresets, opts)
+  return get_preset(name, self.buildPresets, { include_hidden = true, include_disabled = true })
 end
 
 function Presets.find_preset_files(cwd)