fix(install): we can now pass package's features to cmake command when the package's build is CMAKE

Author: genshen

pkg/install/command.go

@@ -81,6 +81,9 @@ func (in *InsExecutor) InsRun(triple pkg.InsTriple, meta *pkg.PackageMeta) error
 	return nil
 }
 
+// InsCMake run cmake config and build command from the triple config.
+// Triple Second: cmake config arguments
+// Triple Third: cmake build arguments
 func (in *InsExecutor) InsCMake(triple pkg.InsTriple, meta *pkg.PackageMeta) error {
 	packageCacheDir := pkg.GetCachePath(in.pkgHome, meta.PackageName)
 	srcPath := meta.VendorSrcPath(in.pkgHome)
@@ -96,10 +99,16 @@ func (in *InsExecutor) InsCMake(triple pkg.InsTriple, meta *pkg.PackageMeta) err
 		}
 	}
 
-	// prepare cmake config and building command arguments
+	// prepare cmake config from "features" in pkg.yaml
+	if meta.Features != nil && len(meta.Features) != 0 {
+		triple.Second = triple.Second + " " + featuresToOptions(meta.Features)
+	}
+	// prepare cmake config from cli
 	if in.cmakeConfigArg != "" {
 		triple.Second = triple.Second + " " + in.cmakeConfigArg
 	}
+
+	// prepare cmake building command arguments
 	if in.cmakeBuildArg != "" {
 		triple.Third = triple.Third + " " + in.cmakeBuildArg
 	}
@@ -131,7 +140,7 @@ func (in *InsExecutor) InsAutoPkg(triple pkg.InsTriple, meta *pkg.PackageMeta) e
 	if pkgEnvInc := os.Getenv("PKG_INNER_BUILD"); pkgEnvInc == "" {
 		// use cmake instruction with features (features as cmake options)
 		triple.First = pkg.InsCmake
-		triple.Second = featuresToOptions(meta.Features)
+		triple.Second = ""
 		triple.Third = ""
 		return in.InsCMake(triple, meta)
 	}

pkg/install/install_shell.go

@@ -95,12 +95,21 @@ func (sh *InsShellWriter) InsCMake(triple pkg.InsTriple, meta *pkg.PackageMeta)
 	pathBase := "${PROJECT_HOME}"
 	srcPath := meta.VendorSrcPath(pathBase)
 
+	// prepare cmake config from "features" in pkg.yaml
+	if meta.Features != nil && len(meta.Features) != 0 {
+		triple.Second = triple.Second + " " + featuresToOptions(meta.Features)
+	}
+
+	// prepare cmake config from cli
 	if sh.cmakeConfigArg != "" {
 		triple.Second = triple.Second + " " + sh.cmakeConfigArg
 	}
+
+	// prepare cmake building command arguments
 	if sh.cmakeBuildArg != "" {
 		triple.Third = triple.Third + " " + sh.cmakeBuildArg
 	}
+
 	var configCmd = fmt.Sprintf("cmake -S \"%s\" -B \"%s\" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=\"%s\" %s",
 		srcPath, pkg.GetCachePath(pathBase, meta.PackageName),
 		pkg.GetPackagePkgPath(pathBase, meta.PackageName), triple.Second)
@@ -118,7 +127,7 @@ func (sh *InsShellWriter) InsAutoPkg(triple pkg.InsTriple, meta *pkg.PackageMeta
 	if pkgEnvInc := os.Getenv("PKG_INNER_BUILD"); pkgEnvInc == "" {
 		// use cmake instruction with features (features as cmake options)
 		triple.First = pkg.InsCmake
-		triple.Second = featuresToOptions(meta.Features)
+		triple.Second = ""
 		triple.Third = ""
 		return sh.InsCMake(triple, meta)
 	}